commit c6007e4fbd9a58ca467fa59feef4a46b8075d434
author Ben Chan <benchan@chromium.org> Thu Sep 19 23:49:22 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Sep 21 17:29:07 2013 +0000
tree b7ea89e9dbf5f63b676e1316f9c8071027cadbfe
parent 41f7fdc7fd0bf88c46a1a0035db2a0ec4252199c

Replace flimflam namespace with shill namespace.

BUG=chromium:295425
CQ-DEPEND=CL:170123
TEST=Build and run unit tests.

Change-Id: Id8ec51b6ff7f2802285706203bc831d3f2277ac7
Reviewed-on: https://chromium-review.googlesource.com/170124
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

connection_manager.cc

diff --git a/connection_manager.cc b/connection_manager.cc
index bbba9f7..bd584b1 100644
--- a/connection_manager.cc
+++ b/connection_manager.cc
@@ -38,7 +38,7 @@
     return false;
   }
   proxy = dbus_iface->ProxyNewForNameOwner(bus,
-                                           flimflam::kFlimflamServiceName,
+                                           shill::kFlimflamServiceName,
                                            path,
                                            interface,
                                            &error);
@@ -90,8 +90,8 @@
   GHashTable* hash_table = NULL;
 
   TEST_AND_RETURN_FALSE(GetProperties(dbus_iface,
-                                      flimflam::kFlimflamServicePath,
-                                      flimflam::kFlimflamManagerInterface,
+                                      shill::kFlimflamServicePath,
+                                      shill::kFlimflamManagerInterface,
                                       &hash_table));
 
   GValue* value = reinterpret_cast<GValue*>(g_hash_table_lookup(hash_table,
@@ -110,15 +110,15 @@
 }
 
 NetworkConnectionType ParseConnectionType(const char* type_str) {
-  if (!strcmp(type_str, flimflam::kTypeEthernet)) {
+  if (!strcmp(type_str, shill::kTypeEthernet)) {
     return kNetEthernet;
-  } else if (!strcmp(type_str, flimflam::kTypeWifi)) {
+  } else if (!strcmp(type_str, shill::kTypeWifi)) {
     return kNetWifi;
-  } else if (!strcmp(type_str, flimflam::kTypeWimax)) {
+  } else if (!strcmp(type_str, shill::kTypeWimax)) {
     return kNetWimax;
-  } else if (!strcmp(type_str, flimflam::kTypeBluetooth)) {
+  } else if (!strcmp(type_str, shill::kTypeBluetooth)) {
     return kNetBluetooth;
-  } else if (!strcmp(type_str, flimflam::kTypeCellular)) {
+  } else if (!strcmp(type_str, shill::kTypeCellular)) {
     return kNetCellular;
   }
   return kNetUnknown;
@@ -131,16 +131,16 @@
 
   TEST_AND_RETURN_FALSE(GetProperties(dbus_iface,
                                       path.c_str(),
-                                      flimflam::kFlimflamServiceInterface,
+                                      shill::kFlimflamServiceInterface,
                                       &hash_table));
 
   GValue* value = (GValue*)g_hash_table_lookup(hash_table,
-                                               flimflam::kTypeProperty);
+                                               shill::kTypeProperty);
   const char* type_str = NULL;
   bool success = false;
   if (value != NULL && (type_str = g_value_get_string(value)) != NULL) {
     success = true;
-    if (!strcmp(type_str, flimflam::kTypeVPN)) {
+    if (!strcmp(type_str, shill::kTypeVPN)) {
       value = (GValue*)g_hash_table_lookup(hash_table,
                                            shill::kPhysicalTechnologyProperty);
       if (value != NULL && (type_str = g_value_get_string(value)) != NULL) {
@@ -187,7 +187,7 @@
         // The update setting is enforced by the device policy.
 
         if ((type == kNetCellular &&
-            !ContainsKey(allowed_types, flimflam::kTypeCellular))) {
+            !ContainsKey(allowed_types, shill::kTypeCellular))) {
           LOG(INFO) << "Disabling updates over cellular connection as it's not "
                        "allowed in the device policy.";
           return false;
@@ -229,11 +229,11 @@
 
 const char* ConnectionManager::StringForConnectionType(
     NetworkConnectionType type) const {
-  static const char* const kValues[] = {flimflam::kTypeEthernet,
-                                        flimflam::kTypeWifi,
-                                        flimflam::kTypeWimax,
-                                        flimflam::kTypeBluetooth,
-                                        flimflam::kTypeCellular};
+  static const char* const kValues[] = {shill::kTypeEthernet,
+                                        shill::kTypeWifi,
+                                        shill::kTypeWimax,
+                                        shill::kTypeBluetooth,
+                                        shill::kTypeCellular};
   if (type < 0 || type >= static_cast<int>(arraysize(kValues))) {
     return "Unknown";
   }