Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

Index: chrome/browser/chromeos/dbus/bluetooth_manager_client.cc
===================================================================
--- chrome/browser/chromeos/dbus/bluetooth_manager_client.cc	(revision 121922)
+++ chrome/browser/chromeos/dbus/bluetooth_manager_client.cc	(working copy)
@@ -9,7 +9,6 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -27,7 +26,7 @@
 
     bluetooth_manager_proxy_ = bus->GetObjectProxy(
         bluetooth_manager::kBluetoothManagerServiceName,
-        dbus::ObjectPath(bluetooth_manager::kBluetoothManagerServicePath));
+        bluetooth_manager::kBluetoothManagerServicePath);
 
     bluetooth_manager_proxy_->ConnectToSignal(
         bluetooth_manager::kBluetoothManagerInterface,
@@ -92,13 +91,13 @@
   void AdapterAddedReceived(dbus::Signal* signal) {
     DCHECK(signal);
     dbus::MessageReader reader(signal);
-    dbus::ObjectPath object_path;
+    std::string object_path;
     if (!reader.PopObjectPath(&object_path)) {
       LOG(ERROR) << "AdapterAdded signal has incorrect parameters: "
-                 << signal->ToString();
+          << signal->ToString();
       return;
     }
-    VLOG(1) << "Adapter added: " << object_path.value();
+    VLOG(1) << "Adapter added: " << object_path;
     FOR_EACH_OBSERVER(Observer, observers_, AdapterAdded(object_path));
   }
 
@@ -113,13 +112,13 @@
   void AdapterRemovedReceived(dbus::Signal* signal) {
     DCHECK(signal);
     dbus::MessageReader reader(signal);
-    dbus::ObjectPath object_path;
+    std::string object_path;
     if (!reader.PopObjectPath(&object_path)) {
       LOG(ERROR) << "AdapterRemoved signal has incorrect parameters: "
-                 << signal->ToString();
+          << signal->ToString();
       return;
     }
-    VLOG(1) << "Adapter removed: " << object_path.value();
+    VLOG(1) << "Adapter removed: " << object_path;
     FOR_EACH_OBSERVER(Observer, observers_, AdapterRemoved(object_path));
   }
 
@@ -134,14 +133,14 @@
   void DefaultAdapterChangedReceived(dbus::Signal* signal) {
     DCHECK(signal);
     dbus::MessageReader reader(signal);
-    dbus::ObjectPath object_path;
-    if (!reader.PopObjectPath(&object_path)) {
+    std::string adapter;
+    if (!reader.PopObjectPath(&adapter)) {
       LOG(ERROR) << "DefaultAdapterChanged signal has incorrect parameters: "
-                 << signal->ToString();
+          << signal->ToString();
       return;
     }
-    VLOG(1) << "Default adapter changed: " << object_path.value();
-    FOR_EACH_OBSERVER(Observer, observers_, DefaultAdapterChanged(object_path));
+    VLOG(1) << "Default adapter changed: " << adapter;
+    FOR_EACH_OBSERVER(Observer, observers_, DefaultAdapterChanged(adapter));
   }
 
   // Called by dbus:: when the DefaultAdapterChanged signal is initially
@@ -158,15 +157,15 @@
                         dbus::Response* response) {
     // Parse response.
     bool success = false;
-    dbus::ObjectPath adapter;
+    std::string adapter;
     if (response != NULL) {
       dbus::MessageReader reader(response);
       if (!reader.PopObjectPath(&adapter)) {
         LOG(ERROR) << "DefaultAdapter response has incorrect parameters: "
-                   << response->ToString();
+            << response->ToString();
       } else {
         success = true;
-        LOG(INFO) << "OnDefaultAdapter: " << adapter.value();
+        LOG(INFO) << "OnDefaultAdapter: " << adapter;
       }
     } else {
       LOG(ERROR) << "Failed to get default adapter.";