Revert 121920 - dbus: add ObjectPath type

dbus/object_proxy.h

 // 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.
 
 #ifndef DBUS_OBJECT_PROXY_H_
 #define DBUS_OBJECT_PROXY_H_
 #pragma once
 
 #include <dbus/dbus.h>
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/string_piece.h"
 #include "base/time.h"
-#include "dbus/object_path.h"
 
 namespace dbus {
 
 class Bus;
 class MethodCall;
 class Response;
 class Signal;
 
 // ObjectProxy is used to communicate with remote objects, mainly for
 // calling methods of these objects.
 //
 // ObjectProxy is a ref counted object, to ensure that |this| of the
 // object is is alive when callbacks referencing |this| are called.
 class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
  public:
   // Client code should use Bus::GetObjectProxy() or
   // Bus::GetObjectProxyWithOptions() instead of this constructor.
   ObjectProxy(Bus* bus,
               const std::string& service_name,
-              const ObjectPath& object_path,
+              const std::string& object_path,
               int options);
 
   // Options to be OR-ed together when calling Bus::GetObjectProxyWithOptions().
   // Set the IGNORE_SERVICE_UNKNOWN_ERRORS option to silence logging of
   // org.freedesktop.DBus.Error.ServiceUnknown errors.
   enum Options {
     DEFAULT_OPTIONS = 0,
     IGNORE_SERVICE_UNKNOWN_ERRORS = 1 << 0
   };
 
@@ skipping 140 matching lines @@
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
 
   // Helper method for logging response errors appropriately.
   void LogMethodCallFailure(const base::StringPiece& error_name,
                             const base::StringPiece& error_message) const;
 
   scoped_refptr<Bus> bus_;
   std::string service_name_;
-  ObjectPath object_path_;
+  std::string object_path_;
 
   // True if the message filter was added.
   bool filter_added_;
 
   // The method table where keys are absolute signal names (i.e. interface
   // name + signal name), and values are the corresponding callbacks.
   typedef std::map<std::string, SignalCallback> MethodTable;
   MethodTable method_table_;
 
   std::set<std::string> match_rules_;
 
   const bool ignore_service_unknown_errors_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_PROXY_H_