Revert 121920 - dbus: add ObjectPath type

dbus/exported_object.cc

-// 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.
 
 #include "dbus/exported_object.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "dbus/scoped_dbus_error.h"
 
 namespace dbus {
 
 namespace {
 
 // Used for success ratio histograms. 1 for success, 0 for failure.
 const int kSuccessRatioHistogramMaxValue = 2;
 
 // Gets the absolute method name by concatenating the interface name and
 // the method name. Used for building keys for method_table_ in
 // ExportedObject.
 std::string GetAbsoluteMethodName(
     const std::string& interface_name,
     const std::string& method_name) {
   return interface_name + "." + method_name;
 }
 
 }  // namespace
 
 ExportedObject::ExportedObject(Bus* bus,
                                const std::string& service_name,
-                               const ObjectPath& object_path)
+                               const std::string& object_path)
     : bus_(bus),
       service_name_(service_name),
       object_path_(object_path),
       object_is_registered_(false) {
 }
 
 ExportedObject::~ExportedObject() {
   DCHECK(!object_is_registered_);
 }
 
@@ skipping 119 matching lines @@
   ScopedDBusError error;
 
   DBusObjectPathVTable vtable = {};
   vtable.message_function = &ExportedObject::HandleMessageThunk;
   vtable.unregister_function = &ExportedObject::OnUnregisteredThunk;
   const bool success = bus_->TryRegisterObjectPath(object_path_,
                                                    &vtable,
                                                    this,
                                                    error.get());
   if (!success) {
-    LOG(ERROR) << "Failed to register the object: " << object_path_.value()
-               << ": " << (error.is_set() ? error.message() : "");
+    LOG(ERROR) << "Failed to register the object: " << object_path_ << ": "
+               << (error.is_set() ? error.message() : "");
     return false;
   }
 
   object_is_registered_ = true;
   return true;
 }
 
 DBusHandlerResult ExportedObject::HandleMessage(
     DBusConnection* connection,
     DBusMessage* raw_message) {
@@ skipping 122 matching lines @@
   return self->HandleMessage(connection, raw_message);
 }
 
 void ExportedObject::OnUnregisteredThunk(DBusConnection *connection,
                                          void* user_data) {
   ExportedObject* self = reinterpret_cast<ExportedObject*>(user_data);
   return self->OnUnregistered(connection);
 }
 
 }  // namespace dbus