Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_sms_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_sms_handler.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 360 matching lines @@
 void NetworkSmsHandler::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkSmsHandler::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NetworkSmsHandler::OnPropertyChanged(const std::string& name,
                                           const base::Value& value) {
-  if (name != flimflam::kDevicesProperty)
+  if (name != shill::kDevicesProperty)
     return;
   const base::ListValue* devices = NULL;
   if (!value.GetAsList(&devices) || !devices)
     return;
   UpdateDevices(devices);
 }
 
 // Private methods
 
 void NetworkSmsHandler::AddReceivedMessage(
@@ skipping 15 matching lines @@
 }
 
 void NetworkSmsHandler::ManagerPropertiesCallback(
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
     LOG(ERROR) << "NetworkSmsHandler: Failed to get manager properties.";
     return;
   }
   const base::Value* value;
-  if (!properties.GetWithoutPathExpansion(flimflam::kDevicesProperty, &value) ||
+  if (!properties.GetWithoutPathExpansion(shill::kDevicesProperty, &value) ||
       value->GetType() != base::Value::TYPE_LIST) {
     LOG(ERROR) << "NetworkSmsHandler: No list value for: "
-               << flimflam::kDevicesProperty;
+               << shill::kDevicesProperty;
     return;
   }
   const base::ListValue* devices = static_cast<const base::ListValue*>(value);
   UpdateDevices(devices);
 }
 
 void NetworkSmsHandler::UpdateDevices(const base::ListValue* devices) {
   for (base::ListValue::const_iterator iter = devices->begin();
        iter != devices->end(); ++iter) {
     std::string device_path;
@@ skipping 15 matching lines @@
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
     LOG(ERROR) << "NetworkSmsHandler: ERROR: " << call_status
                << " For: " << device_path;
     return;
   }
 
   std::string device_type;
   if (!properties.GetStringWithoutPathExpansion(
-          flimflam::kTypeProperty, &device_type)) {
+          shill::kTypeProperty, &device_type)) {
     LOG(ERROR) << "NetworkSmsHandler: No type for: " << device_path;
     return;
   }
-  if (device_type != flimflam::kTypeCellular)
+  if (device_type != shill::kTypeCellular)
     return;
 
   std::string dbus_connection;
   if (!properties.GetStringWithoutPathExpansion(
-          flimflam::kDBusConnectionProperty, &dbus_connection)) {
+          shill::kDBusConnectionProperty, &dbus_connection)) {
     LOG(ERROR) << "Device has no DBusConnection Property: " << device_path;
     return;
   }
 
   std::string object_path_string;
   if (!properties.GetStringWithoutPathExpansion(
-          flimflam::kDBusObjectProperty, &object_path_string)) {
+          shill::kDBusObjectProperty, &object_path_string)) {
     LOG(ERROR) << "Device has no DBusObject Property: " << device_path;
     return;
   }
   dbus::ObjectPath object_path(object_path_string);
   if (object_path_string.compare(
           0, sizeof(modemmanager::kModemManager1ServicePath) - 1,
           modemmanager::kModemManager1ServicePath) == 0) {
     device_handlers_.push_back(
         new ModemManager1NetworkSmsDeviceHandler(
             this, dbus_connection, object_path));
   } else {
     device_handlers_.push_back(
         new ModemManagerNetworkSmsDeviceHandler(
             this, dbus_connection, object_path));
   }
 }
 
 
 }  // namespace chromeos