Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/bluetooth_manager_client.h

Index: chrome/browser/chromeos/dbus/bluetooth_manager_client.h
===================================================================
--- chrome/browser/chromeos/dbus/bluetooth_manager_client.h	(revision 121922)
+++ chrome/browser/chromeos/dbus/bluetooth_manager_client.h	(working copy)
@@ -10,7 +10,6 @@
 
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "dbus/object_path.h"
 
 namespace dbus {
 class Bus;
@@ -29,16 +28,16 @@
 
     // Called when a local bluetooth adapter is added.
     // |object_path| is the dbus object path of the adapter.
-    virtual void AdapterAdded(const dbus::ObjectPath& object_path) {}
+    virtual void AdapterAdded(const std::string& object_path) {}
 
     // Called when a local bluetooth adapter is removed.
     // |object_path| is the dbus object path of the adapter.
-    virtual void AdapterRemoved(const dbus::ObjectPath& object_path) {}
+    virtual void AdapterRemoved(const std::string& object_path) {}
 
     // Called when the default local bluetooth adapter changes.
-    // |object_path| is the dbus object path of the new default adapter.
+    // |adapter| is the dbus object path of the new default adapter.
     // Not called if all adapters are removed.
-    virtual void DefaultAdapterChanged(const dbus::ObjectPath& object_path) {}
+    virtual void DefaultAdapterChanged(const std::string& adapter) {}
   };
 
   virtual ~BluetoothManagerClient();
@@ -48,9 +47,9 @@
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // The DefaultAdapterCallback receives two arguments:
-  // dbus::ObjectPath object_path - the path of the new default adapter
+  // std::string adapter - the unique identifier of the default adapter
   // bool success - whether or not the request succeeded
-  typedef base::Callback<void(const dbus::ObjectPath&, bool)>
+  typedef base::Callback<void(const std::string&, bool)>
       DefaultAdapterCallback;
 
   // Retrieves the dbus object path for the default adapter.