shill: Fix most of warnings from cpplint
Fix most cpplinter's warnings. On a few occasisions, the warnings
produced were false-positives, so added explicit // NOLINT comment
overrides.
There were a few instances of disallowed non-const reference usage
(reported as runtime/reference error by cpplint) for
"DBus::Error &error" which should potentially be changed
to pointers to comply with C++ coding style but I will let Shill
owners do that since there is quite a few of those and the
change isn't brain-dead simple...
BUG=None
TEST=platform2 still compiles and all unit tests pass.
Change-Id: Ic2e31896aa13d20eeb1a85dee74f3db8cccfde2e
Reviewed-on: https://chromium-review.googlesource.com/204164
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index e108111..3597e51 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -49,7 +49,7 @@
class CellularCapabilityUniversalCDMATest : public testing::Test {
public:
- CellularCapabilityUniversalCDMATest(EventDispatcher *dispatcher)
+ explicit CellularCapabilityUniversalCDMATest(EventDispatcher *dispatcher)
: dispatcher_(dispatcher),
capability_(NULL),
device_adaptor_(NULL),
@@ -338,14 +338,14 @@
// Cases when activation fails because |activation_code| is not available.
EXPECT_CALL(*mock_serving_operator_info_, IsMobileNetworkOperatorKnown())
.WillRepeatedly(Return(false));
- EXPECT_CALL(*cdma_proxy, Activate(_,_,_,_)).Times(0);
+ EXPECT_CALL(*cdma_proxy, Activate(_, _, _, _)).Times(0);
capability_->ActivateAutomatic();
Mock::VerifyAndClearExpectations(mock_serving_operator_info_);
Mock::VerifyAndClearExpectations(modem_cdma_proxy_.get());
EXPECT_CALL(*mock_serving_operator_info_, IsMobileNetworkOperatorKnown())
.WillRepeatedly(Return(true));
mock_serving_operator_info_->SetEmptyDefaultsForProperties();
- EXPECT_CALL(*cdma_proxy, Activate(_,_,_,_)).Times(0);
+ EXPECT_CALL(*cdma_proxy, Activate(_, _, _, _)).Times(0);
capability_->ActivateAutomatic();
Mock::VerifyAndClearExpectations(mock_serving_operator_info_);
Mock::VerifyAndClearExpectations(modem_cdma_proxy_.get());
@@ -361,9 +361,9 @@
.WillOnce(Return(PendingActivationStore::kStatePending))
.WillOnce(Return(PendingActivationStore::kStateActivated));
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- SetActivationState(_,_,_))
+ SetActivationState(_, _, _))
.Times(0);
- EXPECT_CALL(*cdma_proxy, Activate(_,_,_,_)).Times(0);
+ EXPECT_CALL(*cdma_proxy, Activate(_, _, _, _)).Times(0);
capability_->ActivateAutomatic();
capability_->ActivateAutomatic();
Mock::VerifyAndClearExpectations(modem_info_.mock_pending_activation_store());
@@ -374,9 +374,9 @@
.WillOnce(Return(PendingActivationStore::kStateUnknown))
.WillOnce(Return(PendingActivationStore::kStateFailureRetry));
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- SetActivationState(_,_, PendingActivationStore::kStatePending))
+ SetActivationState(_, _, PendingActivationStore::kStatePending))
.Times(2);
- EXPECT_CALL(*cdma_proxy, Activate(_,_,_,_)).Times(2);
+ EXPECT_CALL(*cdma_proxy, Activate(_, _, _, _)).Times(2);
capability_->ActivateAutomatic();
capability_->ActivateAutomatic();
Mock::VerifyAndClearExpectations(modem_info_.mock_pending_activation_store());
@@ -466,7 +466,7 @@
TEST_F(CellularCapabilityUniversalCDMAMainTest, IsActivating) {
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.WillOnce(Return(PendingActivationStore::kStatePending))
.WillOnce(Return(PendingActivationStore::kStatePending))
.WillOnce(Return(PendingActivationStore::kStateFailureRetry))
@@ -568,10 +568,10 @@
TEST_F(CellularCapabilityUniversalCDMADispatcherTest,
UpdatePendingActivationState) {
capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED;
- EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_,_))
+ EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_, _))
.Times(1);
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.Times(0);
EXPECT_CALL(*modem_info_.mock_dispatcher(), PostTask(_)).Times(0);
capability_->UpdatePendingActivationState();
@@ -579,10 +579,10 @@
Mock::VerifyAndClearExpectations(modem_info_.mock_dispatcher());
capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING;
- EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_,_))
+ EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_, _))
.Times(0);
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.Times(2)
.WillRepeatedly(Return(PendingActivationStore::kStateUnknown));
EXPECT_CALL(*modem_info_.mock_dispatcher(), PostTask(_)).Times(0);
@@ -591,10 +591,10 @@
Mock::VerifyAndClearExpectations(modem_info_.mock_dispatcher());
capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED;
- EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_,_))
+ EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_, _))
.Times(0);
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.Times(2)
.WillRepeatedly(Return(PendingActivationStore::kStatePending));
EXPECT_CALL(*modem_info_.mock_dispatcher(), PostTask(_)).Times(0);
@@ -602,10 +602,10 @@
Mock::VerifyAndClearExpectations(modem_info_.mock_pending_activation_store());
Mock::VerifyAndClearExpectations(modem_info_.mock_dispatcher());
- EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_,_))
+ EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_, _))
.Times(0);
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.Times(2)
.WillRepeatedly(Return(PendingActivationStore::kStateFailureRetry));
EXPECT_CALL(*modem_info_.mock_dispatcher(), PostTask(_)).Times(1);
@@ -613,10 +613,10 @@
Mock::VerifyAndClearExpectations(modem_info_.mock_pending_activation_store());
Mock::VerifyAndClearExpectations(modem_info_.mock_dispatcher());
- EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_,_))
+ EXPECT_CALL(*modem_info_.mock_pending_activation_store(), RemoveEntry(_, _))
.Times(0);
EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
- GetActivationState(_,_))
+ GetActivationState(_, _))
.Times(4)
.WillOnce(Return(PendingActivationStore::kStateActivated))
.WillOnce(Return(PendingActivationStore::kStateActivated))