Revert 121920 - dbus: add ObjectPath type

dbus/exported_object.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_EXPORTED_OBJECT_H_
 #define DBUS_EXPORTED_OBJECT_H_
 #pragma once
 
 #include <dbus/dbus.h>
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
-#include "dbus/object_path.h"
 
 namespace dbus {
 
 class Bus;
 class MethodCall;
 class Response;
 class Signal;
 
 // ExportedObject is used to export objects and methods to other D-Bus
 // clients.
 //
 // ExportedObject is a ref counted object, to ensure that |this| of the
 // object is alive when callbacks referencing |this| are called.
 class ExportedObject : public base::RefCountedThreadSafe<ExportedObject> {
  public:
   // Client code should use Bus::GetExportedObject() instead of this
   // constructor.
   ExportedObject(Bus* bus,
                  const std::string& service_name,
-                 const ObjectPath& object_path);
+                 const std::string& object_path);
 
   // Called to send a response from an exported method. Response* is the
   // response message. Callers should pass a NULL Response* in the event
   // of an error that prevents the sending of a response.
   typedef base::Callback<void (Response*)> ResponseSender;
 
   // Called when an exported method is called. MethodCall* is the request
   // message. ResponseSender is the callback that should be used to send a
   // response.
   typedef base::Callback<void (MethodCall*, ResponseSender)> MethodCallCallback;
@@ skipping 100 matching lines @@
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
 
   // Redirects the function call to OnUnregistered().
   static void OnUnregisteredThunk(DBusConnection* connection,
                                   void* user_data);
 
   scoped_refptr<Bus> bus_;
   std::string service_name_;
-  ObjectPath object_path_;
+  std::string object_path_;
   bool object_is_registered_;
 
   // The method table where keys are absolute method names (i.e. interface
   // name + method name), and values are the corresponding callbacks.
   typedef std::map<std::string, MethodCallCallback> MethodTable;
   MethodTable method_table_;
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_EXPORTED_OBJECT_H_