Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_configuration_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
     const network_handler::DictionaryResultCallback& callback,
     const network_handler::ErrorCallback& error_callback,
     const std::string& service_path,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
   // Get the correct name from WifiHex if necessary.
   scoped_ptr<base::DictionaryValue> properties_copy(properties.DeepCopy());
   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
     // failures regularly, so don't log these.
     if (!error_callback.is_null()) {
       scoped_ptr<base::DictionaryValue> error_data(
           network_handler::CreateErrorData(
               service_path,
               network_handler::kDBusFailedError,
               network_handler::kDBusFailedErrorMessage));
@@ skipping 10 matching lines @@
     const network_handler::ErrorCallback& error_callback,
     const std::string& dbus_error_name,
     const std::string& dbus_error_message) {
   network_handler::ShillErrorCallbackFunction(
       "Config.SetNetworkProfile Failed: " + profile_path,
       service_path, error_callback,
       dbus_error_name, dbus_error_message);
 }
 
 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,
                          const std::string& path,
                          const base::DictionaryValue& properties) {
   for (base::DictionaryValue::Iterator iter(properties);
        !iter.IsAtEnd(); iter.Advance()) {
     std::string v = "******";
     if (!IsPassphrase(iter.key()))
       base::JSONWriter::Write(&iter.value(), &v);
@@ skipping 164 matching lines @@
                  AsWeakPtr(), service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::CreateConfiguration(
     const base::DictionaryValue& properties,
     const network_handler::StringResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) {
   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(
       dbus::ObjectPath(profile),
       properties,
       base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
                  AsWeakPtr(),
                  callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  "Config.CreateConfiguration Failed",
@@ skipping 21 matching lines @@
 
 void NetworkConfigurationHandler::SetNetworkProfile(
     const std::string& service_path,
     const std::string& profile_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG_USER("SetNetworkProfile", service_path + ": " + profile_path);
   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,
                  service_path, profile_path, error_callback));
 }
 
 // NetworkConfigurationHandler Private methods
 
 NetworkConfigurationHandler::NetworkConfigurationHandler()
     : network_state_handler_(NULL) {
@@ skipping 104 matching lines @@
 
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler);
   return handler;
 }
 
 }  // namespace chromeos