Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/bluetooth_manager_client.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 "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #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"
 
 namespace chromeos {
 
 // The BluetoothManagerClient implementation used in production.
 class BluetoothManagerClientImpl : public BluetoothManagerClient {
  public:
   explicit BluetoothManagerClientImpl(dbus::Bus* bus)
       : weak_ptr_factory_(this),
         bluetooth_manager_proxy_(NULL) {
     VLOG(1) << "Creating BluetoothManagerClientImpl";
 
     DCHECK(bus);
 
     bluetooth_manager_proxy_ = bus->GetObjectProxy(
         bluetooth_manager::kBluetoothManagerServiceName,
-        dbus::ObjectPath(bluetooth_manager::kBluetoothManagerServicePath));
+        bluetooth_manager::kBluetoothManagerServicePath);
 
     bluetooth_manager_proxy_->ConnectToSignal(
         bluetooth_manager::kBluetoothManagerInterface,
         bluetooth_manager::kAdapterAddedSignal,
         base::Bind(&BluetoothManagerClientImpl::AdapterAddedReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothManagerClientImpl::AdapterAddedConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     bluetooth_manager_proxy_->ConnectToSignal(
@@ skipping 44 matching lines @@
       dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
       base::Bind(&BluetoothManagerClientImpl::OnDefaultAdapter,
                  weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
   // Called by dbus:: when an AdapterAdded signal is received.
   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));
   }
 
   // Called by dbus:: when the AdapterAdded signal is initially connected.
   void AdapterAddedConnected(const std::string& interface_name,
                              const std::string& signal_name,
                              bool success) {
     LOG_IF(WARNING, !success) << "Failed to connect to AdapterAdded signal.";
   }
 
   // Called by dbus:: when an AdapterRemoved signal is received.
   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));
   }
 
   // Called by dbus:: when the AdapterRemoved signal is initially connected.
   void AdapterRemovedConnected(const std::string& interface_name,
                                const std::string& signal_name,
                                bool success) {
     LOG_IF(WARNING, !success) << "Failed to connect to AdapterRemoved signal.";
   }
 
   // Called by dbus:: when a DefaultAdapterChanged signal is received.
   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
   // connected.
   void DefaultAdapterChangedConnected(const std::string& interface_name,
                                       const std::string& signal_name,
                                       bool success) {
     LOG_IF(WARNING, !success)
         << "Failed to connect to DefaultAdapterChanged signal.";
   }
 
   // Called when a response for DefaultAdapter() is received.
   void OnDefaultAdapter(const DefaultAdapterCallback& callback,
                         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.";
     }
 
     // Notify client.
     callback.Run(adapter, success);
   }
 
   // Weak pointer factory for generating 'this' pointers that might live longer
@@ skipping 35 matching lines @@
 
 BluetoothManagerClient* BluetoothManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new BluetoothManagerClientImpl(bus);
   } else {
     return new BluetoothManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos