Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_device_handler.cc

Index: chromeos/network/network_device_handler.cc
diff --git a/chromeos/network/network_device_handler.cc b/chromeos/network/network_device_handler.cc
index c480073f8f8474611f3ea1677754b60941730610..ab456eb0d5564f21be84b268fa9a57d23b7b9da2 100644
--- a/chromeos/network/network_device_handler.cc
+++ b/chromeos/network/network_device_handler.cc
@@ -33,11 +33,11 @@ std::string GetErrorNameForShillError(const std::string& shill_error_name) {
     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;
 }
@@ -73,13 +73,13 @@ void RefreshIPConfigsCallback(
     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;
   }