Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/cros_disks_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/cros_disks_client.h"
 
 #include "base/bind.h"
 #include "base/stl_util.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 {
 
 namespace {
 
 const char* kDefaultMountOptions[] = {
   "rw",
   "nodev",
@@ skipping 76 matching lines @@
                             std::vector<std::string>* value) {
   if (!reader)
     return false;
   return reader->PopArrayOfStrings(value);
 }
 
 // The CrosDisksClient implementation.
 class CrosDisksClientImpl : public CrosDisksClient {
  public:
   explicit CrosDisksClientImpl(dbus::Bus* bus)
-      : proxy_(bus->GetObjectProxy(
-          cros_disks::kCrosDisksServiceName,
-          dbus::ObjectPath(cros_disks::kCrosDisksServicePath))),
+      : proxy_(bus->GetObjectProxy(cros_disks::kCrosDisksServiceName,
+                                   cros_disks::kCrosDisksServicePath)),
         weak_ptr_factory_(this) {
   }
 
   // CrosDisksClient override.
   virtual void Mount(const std::string& source_path,
                      MountType type,
                      MountCallback callback,
                      ErrorCallback error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kMount);
@@ skipping 435 matching lines @@
 
 // static
 CrosDisksClient* CrosDisksClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS())
     return new CrosDisksClientImpl(bus);
   else
     return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos