Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_device_handler.cc

 // Copyright 2013 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_device_handler.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
@@ skipping 15 matching lines @@
 const char kShillErrorNotSupported[] =
     "org.chromium.flimflam.Error.NotSupported";
 
 std::string GetErrorNameForShillError(const std::string& shill_error_name) {
   // TODO(armansito): Use the new SIM error names once the ones below get
   // deprecated (crbug.com/256855)
   if (shill_error_name == kShillErrorFailure)
     return NetworkDeviceHandler::kErrorFailure;
   if (shill_error_name == kShillErrorNotSupported)
     return NetworkDeviceHandler::kErrorNotSupported;
-  if (shill_error_name == flimflam::kErrorIncorrectPinMsg)
+  if (shill_error_name == shill::kErrorIncorrectPinMsg)
     return NetworkDeviceHandler::kErrorIncorrectPin;
-  if (shill_error_name == flimflam::kErrorPinBlockedMsg)
+  if (shill_error_name == shill::kErrorPinBlockedMsg)
     return NetworkDeviceHandler::kErrorPinBlocked;
-  if (shill_error_name == flimflam::kErrorPinRequiredMsg)
+  if (shill_error_name == shill::kErrorPinRequiredMsg)
     return NetworkDeviceHandler::kErrorPinRequired;
   return NetworkDeviceHandler::kErrorUnknown;
 }
 
 void HandleShillCallFailure(
     const std::string& device_path,
     const network_handler::ErrorCallback& error_callback,
     const std::string& shill_error_name,
     const std::string& shill_error_message) {
   network_handler::ShillErrorCallbackFunction(
@@ skipping 15 matching lines @@
   }
 }
 
 void RefreshIPConfigsCallback(
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback,
     const std::string& device_path,
     const base::DictionaryValue& properties) {
   const ListValue* ip_configs;
   if (!properties.GetListWithoutPathExpansion(
-          flimflam::kIPConfigsProperty, &ip_configs)) {
+          shill::kIPConfigsProperty, &ip_configs)) {
     NET_LOG_ERROR("RequestRefreshIPConfigs Failed", device_path);
     network_handler::ShillErrorCallbackFunction(
         "RequestRefreshIPConfigs Failed",
         device_path,
         error_callback,
-        std::string("Missing ") + flimflam::kIPConfigsProperty, "");
+        std::string("Missing ") + shill::kIPConfigsProperty, "");
     return;
   }
 
   for (size_t i = 0; i < ip_configs->GetSize(); i++) {
     std::string ipconfig_path;
     if (!ip_configs->GetString(i, &ipconfig_path))
       continue;
     DBusThreadManager::Get()->GetShillIPConfigClient()->Refresh(
         dbus::ObjectPath(ipconfig_path),
         base::Bind(&IPConfigRefreshCallback, ipconfig_path));
@@ skipping 166 matching lines @@
 void NetworkDeviceHandler::HandleShillCallFailureForTest(
     const std::string& device_path,
     const network_handler::ErrorCallback& error_callback,
     const std::string& shill_error_name,
     const std::string& shill_error_message) {
   HandleShillCallFailure(
       device_path, error_callback, shill_error_name, shill_error_message);
 }
 
 }  // namespace chromeos