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.cc

diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index 6dbe183..cdb93d9 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -204,11 +204,11 @@
   cellular()->service()->SetActivateOverNonCellularNetwork(activation_required);
   string activation_state;
   if (IsActivating())
-      activation_state = flimflam::kActivationStateActivating;
+      activation_state = kActivationStateActivating;
   else if (activation_required)
-      activation_state = flimflam::kActivationStateNotActivated;
+      activation_state = kActivationStateNotActivated;
   else
-      activation_state = flimflam::kActivationStateActivated;
+      activation_state = kActivationStateActivated;
   cellular()->service()->SetActivationState(activation_state);
 }
 
@@ -392,15 +392,15 @@
     uint32 state) {
   switch (state) {
     case MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED:
-      return flimflam::kActivationStateActivated;
+      return kActivationStateActivated;
     case MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING:
-      return flimflam::kActivationStateActivating;
+      return kActivationStateActivating;
     case MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED:
-      return flimflam::kActivationStateNotActivated;
+      return kActivationStateNotActivated;
     case MM_MODEM_CDMA_ACTIVATION_STATE_PARTIALLY_ACTIVATED:
-      return flimflam::kActivationStatePartiallyActivated;
+      return kActivationStatePartiallyActivated;
     default:
-      return flimflam::kActivationStateUnknown;
+      return kActivationStateUnknown;
   }
 }
 
@@ -409,18 +409,18 @@
     uint32 error) {
   switch (error) {
     case MM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE:
-      return flimflam::kErrorNeedEvdo;
+      return kErrorNeedEvdo;
     case MM_CDMA_ACTIVATION_ERROR_ROAMING:
-      return flimflam::kErrorNeedHomeNetwork;
+      return kErrorNeedHomeNetwork;
     case MM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT:
     case MM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED:
     case MM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED:
-      return flimflam::kErrorOtaspFailed;
+      return kErrorOtaspFailed;
     case MM_CDMA_ACTIVATION_ERROR_NONE:
       return "";
     case MM_CDMA_ACTIVATION_ERROR_NO_SIGNAL:
     default:
-      return flimflam::kErrorActivationFailed;
+      return kErrorActivationFailed;
   }
 }
 
@@ -513,13 +513,13 @@
     case MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED:
       break;
     case MM_MODEM_CDMA_REGISTRATION_STATE_HOME:
-      return flimflam::kRoamingStateHome;
+      return kRoamingStateHome;
     case MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING:
-      return flimflam::kRoamingStateRoaming;
+      return kRoamingStateRoaming;
     default:
       NOTREACHED();
   }
-  return flimflam::kRoamingStateUnknown;
+  return kRoamingStateUnknown;
 }
 
 void CellularCapabilityUniversalCDMA::OnDBusPropertiesChanged(