Migrate DBus service constants from flimflam namespace to shill namespace.

All shill DBus service constants have been moved from the flimflam namespace to
the shill namespace. This CL makes the corresponding changes on the Chrome
side.

Related CLs:
  https://chromium-review.googlesource.com/#/c/170123/
  https://chromium-review.googlesource.com/#/c/170205/
  https://chromium-review.googlesource.com/#/c/170206/
  https://chromium-review.googlesource.com/#/c/170207/
  https://chromium-review.googlesource.com/#/c/170208/
  https://chromium-review.googlesource.com/#/c/170209/
  https://chromium-review.googlesource.com/#/c/170223/
  https://chromium-review.googlesource.com/#/c/170230/
  https://chromium-review.googlesource.com/#/c/170231/

BUG=295425
R=gspencer@chromium.org,gauravsh@chromium.org,stevenjb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/24348002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224942 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 14 deletions

diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc
index 7748623..f464dee 100644
--- a/chromeos/network/network_configuration_handler.cc
+++ b/chromeos/network/network_configuration_handler.cc
@@ -60,8 +60,7 @@ void GetPropertiesCallback(
   std::string name =
       shill_property_util::GetNameFromProperties(service_path, properties);
   if (!name.empty()) {
-    properties_copy->SetStringWithoutPathExpansion(
-        flimflam::kNameProperty, name);
+    properties_copy->SetStringWithoutPathExpansion(shill::kNameProperty, name);
   }
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
     // Because network services are added and removed frequently, we will see
@@ -92,15 +91,15 @@ void SetNetworkProfileErrorCallback(
 }
 
 bool IsPassphrase(const std::string& key) {
-  return key == flimflam::kEapPrivateKeyPasswordProperty ||
-      key == flimflam::kEapPasswordProperty ||
-      key == flimflam::kL2tpIpsecPasswordProperty ||
-      key == flimflam::kOpenVPNPasswordProperty ||
-      key == flimflam::kPassphraseProperty ||
-      key == flimflam::kOpenVPNOTPProperty ||
-      key == flimflam::kEapPrivateKeyProperty ||
-      key == flimflam::kEapPinProperty ||
-      key == flimflam::kApnPasswordProperty;
+  return key == shill::kEapPrivateKeyPasswordProperty ||
+      key == shill::kEapPasswordProperty ||
+      key == shill::kL2tpIpsecPasswordProperty ||
+      key == shill::kOpenVPNPasswordProperty ||
+      key == shill::kPassphraseProperty ||
+      key == shill::kOpenVPNOTPProperty ||
+      key == shill::kEapPrivateKeyProperty ||
+      key == shill::kEapPinProperty ||
+      key == shill::kApnPasswordProperty;
 }
 
 void LogConfigProperties(const std::string& desc,
@@ -285,13 +284,13 @@ void NetworkConfigurationHandler::CreateConfiguration(
   ShillManagerClient* manager =
       DBusThreadManager::Get()->GetShillManagerClient();
   std::string type;
-  properties.GetStringWithoutPathExpansion(flimflam::kTypeProperty, &type);
+  properties.GetStringWithoutPathExpansion(shill::kTypeProperty, &type);
 
   NET_LOG_USER("CreateConfiguration", type);
   LogConfigProperties("Configure", type, properties);
 
   std::string profile;
-  properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
+  properties.GetStringWithoutPathExpansion(shill::kProfileProperty,
                                            &profile);
   DCHECK(!profile.empty());
   manager->ConfigureServiceForProfile(
@@ -333,7 +332,7 @@ void NetworkConfigurationHandler::SetNetworkProfile(
   base::StringValue profile_path_value(profile_path);
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(service_path),
-      flimflam::kProfileProperty,
+      shill::kProfileProperty,
       profile_path_value,
       callback,
       base::Bind(&SetNetworkProfileErrorCallback,