commit 7ea768e15de860c8a27143ead02a8d3f15ab9f47
author Ben Chan <benchan@chromium.org> Fri Sep 20 15:08:40 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Sep 21 17:29:04 2013 +0000
tree 7d8854a73822c9d51d0ac4952041824a30d200b7
parent 4276ccab7a3bdf1c2e2e69cf79b859733d7404a0

shill: cellular: Deprecate flimflam namespace.

CL:170123 moves all DBus service constants from the flimflam namespace
to the shill namespace. This CL removes the use of the flimflam
namespace in cellular code.

BUG=chromium:295425
CQ-DEPEND=CL:170123
TEST=Unit tests and trybot runs on release builders.

Change-Id: I751c66c9d1d727007b8cd5510a8f76b094b6352b
Reviewed-on: https://chromium-review.googlesource.com/170223
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular_capability_universal_cdma_unittest.cc

diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index 49d15a6..891f42b 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -468,42 +468,34 @@
   EXPECT_CALL(*modem_info_.mock_cellular_operator_info(), GetOLPBySID(_))
       .WillRepeatedly(Return(&olp));
   EXPECT_CALL(*modem_info_.mock_pending_activation_store(),
-              GetActivationState(_,_))
+              GetActivationState(_, _))
       .WillOnce(Return(PendingActivationStore::kStatePending))
       .WillRepeatedly(Return(PendingActivationStore::kStateUnknown));
 
-  capability_->activation_state_ =
-      MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED;
-  EXPECT_CALL(*service_,
-              SetActivationState(flimflam::kActivationStateActivating))
+  capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED;
+  EXPECT_CALL(*service_, SetActivationState(kActivationStateActivating))
       .Times(1);
   capability_->UpdateServiceActivationStateProperty();
   Mock::VerifyAndClearExpectations(service_);
 
-  EXPECT_CALL(*service_,
-              SetActivationState(flimflam::kActivationStateNotActivated))
+  EXPECT_CALL(*service_, SetActivationState(kActivationStateNotActivated))
       .Times(1);
   capability_->UpdateServiceActivationStateProperty();
   Mock::VerifyAndClearExpectations(service_);
 
-  capability_->activation_state_ =
-      MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING;
-  EXPECT_CALL(*service_,
-              SetActivationState(flimflam::kActivationStateActivating))
+  capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING;
+  EXPECT_CALL(*service_, SetActivationState(kActivationStateActivating))
       .Times(1);
   capability_->UpdateServiceActivationStateProperty();
   Mock::VerifyAndClearExpectations(service_);
 
-  capability_->activation_state_ =
-      MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED;
-  EXPECT_CALL(*service_,
-              SetActivationState(flimflam::kActivationStateActivated))
+  capability_->activation_state_ = MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED;
+  EXPECT_CALL(*service_, SetActivationState(kActivationStateActivated))
       .Times(1);
   capability_->UpdateServiceActivationStateProperty();
   Mock::VerifyAndClearExpectations(service_);
   Mock::VerifyAndClearExpectations(modem_info_.mock_cellular_operator_info());
-  Mock::VerifyAndClearExpectations(
-      modem_info_.mock_pending_activation_store());
+  Mock::VerifyAndClearExpectations(modem_info_.mock_pending_activation_store());
 }
 
 TEST_F(CellularCapabilityUniversalCDMAMainTest, IsActivating) {