Fix NetworkSMSHandler to use DBus service name instead of connection.

chromeos/network/network_sms_handler.cc

Index: chromeos/network/network_sms_handler.cc
diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc
index d7df46e5c76ced797232a35e356e7ac1f412e1a7..d6e608cd98be3a376bc44cf08b1fd06c66eba4be 100644
--- a/chromeos/network/network_sms_handler.cc
+++ b/chromeos/network/network_sms_handler.cc
@@ -54,8 +54,8 @@ class NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler
     : public NetworkSmsHandler::NetworkSmsDeviceHandler {
  public:
   ModemManagerNetworkSmsDeviceHandler(NetworkSmsHandler* host,
-                                      std::string dbus_connection,
-                                      dbus::ObjectPath object_path);
+                                      const std::string& service_name,
+                                      const dbus::ObjectPath& object_path);
 
   virtual void RequestUpdate() OVERRIDE;
 
@@ -67,7 +67,7 @@ class NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler
   void MessageReceived(const base::DictionaryValue& dictionary);
 
   NetworkSmsHandler* host_;
-  std::string dbus_connection_;
+  std::string service_name_;
   dbus::ObjectPath object_path_;
   bool deleting_messages_;
   base::WeakPtrFactory<ModemManagerNetworkSmsDeviceHandler> weak_ptr_factory_;
@@ -79,22 +79,22 @@ class NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler
 NetworkSmsHandler::
 ModemManagerNetworkSmsDeviceHandler::ModemManagerNetworkSmsDeviceHandler(
     NetworkSmsHandler* host,
-    std::string dbus_connection,
-    dbus::ObjectPath object_path)
+    const std::string& service_name,
+    const dbus::ObjectPath& object_path)
     : host_(host),
-      dbus_connection_(dbus_connection),
+      service_name_(service_name),
       object_path_(object_path),
       deleting_messages_(false),
       weak_ptr_factory_(this) {
   // Set the handler for received Sms messaages.
   DBusThreadManager::Get()->GetGsmSMSClient()->SetSmsReceivedHandler(
-      dbus_connection_, object_path_,
+      service_name_, object_path_,
       base::Bind(&ModemManagerNetworkSmsDeviceHandler::SmsReceivedCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // List the existing messages.
   DBusThreadManager::Get()->GetGsmSMSClient()->List(
-      dbus_connection_, object_path_,
+      service_name_, object_path_,
       base::Bind(&NetworkSmsHandler::
                  ModemManagerNetworkSmsDeviceHandler::ListCallback,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -102,7 +102,7 @@ ModemManagerNetworkSmsDeviceHandler::ModemManagerNetworkSmsDeviceHandler(
 
 void NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler::RequestUpdate() {
   DBusThreadManager::Get()->GetGsmSMSClient()->RequestUpdate(
-      dbus_connection_, object_path_);
+      service_name_, object_path_);
 }
 
 void NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler::ListCallback(
@@ -134,7 +134,7 @@ void NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler::DeleteMessages() {
   uint32 index = delete_queue_.back();
   delete_queue_.pop_back();
   DBusThreadManager::Get()->GetGsmSMSClient()->Delete(
-      dbus_connection_, object_path_, index,
+      service_name_, object_path_, index,
       base::Bind(&NetworkSmsHandler::
                  ModemManagerNetworkSmsDeviceHandler::DeleteMessages,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -148,7 +148,7 @@ ModemManagerNetworkSmsDeviceHandler::SmsReceivedCallback(
   if (!complete)
     return;
   DBusThreadManager::Get()->GetGsmSMSClient()->Get(
-      dbus_connection_, object_path_, index,
+      service_name_, object_path_, index,
       base::Bind(&NetworkSmsHandler::
                  ModemManagerNetworkSmsDeviceHandler::GetCallback,
                  weak_ptr_factory_.GetWeakPtr(), index));
@@ -176,8 +176,8 @@ class NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler
     : public NetworkSmsHandler::NetworkSmsDeviceHandler {
  public:
   ModemManager1NetworkSmsDeviceHandler(NetworkSmsHandler* host,
-                                       std::string dbus_connection,
-                                       dbus::ObjectPath object_path);
+                                       const std::string& service_name,
+                                       const dbus::ObjectPath& object_path);
 
   virtual void RequestUpdate() OVERRIDE;
 
@@ -190,7 +190,7 @@ class NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler
   void MessageReceived(const base::DictionaryValue& dictionary);
 
   NetworkSmsHandler* host_;
-  std::string dbus_connection_;
+  std::string service_name_;
   dbus::ObjectPath object_path_;
   bool deleting_messages_;
   bool retrieving_messages_;
@@ -204,17 +204,17 @@ class NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler
 NetworkSmsHandler::
 ModemManager1NetworkSmsDeviceHandler::ModemManager1NetworkSmsDeviceHandler(
     NetworkSmsHandler* host,
-    std::string dbus_connection,
-    dbus::ObjectPath object_path)
+    const std::string& service_name,
+    const dbus::ObjectPath& object_path)
     : host_(host),
-      dbus_connection_(dbus_connection),
+      service_name_(service_name),
       object_path_(object_path),
       deleting_messages_(false),
       retrieving_messages_(false),
       weak_ptr_factory_(this) {
   // Set the handler for received Sms messaages.
   DBusThreadManager::Get()->GetModemMessagingClient()->SetSmsReceivedHandler(
-      dbus_connection_, object_path_,
+      service_name_, object_path_,
       base::Bind(
           &NetworkSmsHandler::
           ModemManager1NetworkSmsDeviceHandler::SmsReceivedCallback,
@@ -222,7 +222,7 @@ ModemManager1NetworkSmsDeviceHandler::ModemManager1NetworkSmsDeviceHandler(
 
   // List the existing messages.
   DBusThreadManager::Get()->GetModemMessagingClient()->List(
-      dbus_connection_, object_path_,
+      service_name_, object_path_,
       base::Bind(&NetworkSmsHandler::
                  ModemManager1NetworkSmsDeviceHandler::ListCallback,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -262,7 +262,7 @@ void NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler::DeleteMessages() {
   dbus::ObjectPath sms_path = delete_queue_.back();
   delete_queue_.pop_back();
   DBusThreadManager::Get()->GetModemMessagingClient()->Delete(
-      dbus_connection_, object_path_, sms_path,
+      service_name_, object_path_, sms_path,
       base::Bind(&NetworkSmsHandler::
                  ModemManager1NetworkSmsDeviceHandler::DeleteMessages,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -281,7 +281,7 @@ void NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler::GetMessages() {
   dbus::ObjectPath sms_path = retrieval_queue_.front();
   retrieval_queue_.pop_front();
   DBusThreadManager::Get()->GetSMSClient()->GetAll(
-      dbus_connection_, sms_path,
+      service_name_, sms_path,
       base::Bind(&NetworkSmsHandler::
                  ModemManager1NetworkSmsDeviceHandler::GetCallback,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -457,10 +457,10 @@ void NetworkSmsHandler::DevicePropertiesCallback(
   if (device_type != shill::kTypeCellular)
     return;
 
-  std::string dbus_connection;
+  std::string service_name;
   if (!properties.GetStringWithoutPathExpansion(
-          shill::kDBusConnectionProperty, &dbus_connection)) {
-    LOG(ERROR) << "Device has no DBusConnection Property: " << device_path;
+          shill::kDBusServiceProperty, &service_name)) {
+    LOG(ERROR) << "Device has no DBusService Property: " << device_path;
     return;
   }
 
@@ -471,18 +471,15 @@ void NetworkSmsHandler::DevicePropertiesCallback(
     return;
   }
   dbus::ObjectPath object_path(object_path_string);
-  if (object_path_string.compare(
-          0, sizeof(modemmanager::kModemManager1ServicePath) - 1,
-          modemmanager::kModemManager1ServicePath) == 0) {
+  if (service_name == modemmanager::kModemManager1) {
     device_handlers_.push_back(
         new ModemManager1NetworkSmsDeviceHandler(
-            this, dbus_connection, object_path));
+            this, service_name, object_path));
   } else {
     device_handlers_.push_back(
         new ModemManagerNetworkSmsDeviceHandler(
-            this, dbus_connection, object_path));
+            this, service_name, object_path));
   }
 }
 
-
 }  // namespace chromeos