Revert 121920 - dbus: add ObjectPath type

dbus/test_service.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 "dbus/test_service.h"
 
 #include "base/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 
 namespace dbus {
 
 // Echo, SlowEcho, AsyncEcho, BrokenMethod.
 const int TestService::kNumMethodsToExport = 4;
 
 TestService::Options::Options() {
 }
 
 TestService::Options::~Options() {
@@ skipping 66 matching lines @@
 }
 
 void TestService::SendTestSignalFromRootInternal(const std::string& message) {
   dbus::Signal signal("org.chromium.TestInterface", "Test");
   dbus::MessageWriter writer(&signal);
   writer.AppendString(message);
 
   // Use "/" just like dbus-send does.
   ExportedObject* root_object =
       bus_->GetExportedObject("org.chromium.TestService",
-                              dbus::ObjectPath("/"));
+                              "/");
   root_object->SendSignal(&signal);
 }
 
 void TestService::OnExported(const std::string& interface_name,
                              const std::string& method_name,
                              bool success) {
   if (!success) {
     LOG(ERROR) << "Failed to export: " << interface_name << "."
                << method_name;
     // Returning here will make WaitUntilServiceIsStarted() to time out
     // and return false.
     return;
   }
 
   ++num_exported_methods_;
   if (num_exported_methods_ == kNumMethodsToExport)
     on_all_methods_exported_.Signal();
 }
 
 void TestService::Run(MessageLoop* message_loop) {
   Bus::Options bus_options;
   bus_options.bus_type = Bus::SESSION;
   bus_options.connection_type = Bus::PRIVATE;
   bus_options.dbus_thread_message_loop_proxy = dbus_thread_message_loop_proxy_;
   bus_ = new Bus(bus_options);
 
   exported_object_ = bus_->GetExportedObject(
       "org.chromium.TestService",
-      dbus::ObjectPath("/org/chromium/TestObject"));
+      "/org/chromium/TestObject");
 
   int num_methods = 0;
   exported_object_->ExportMethod(
       "org.chromium.TestInterface",
       "Echo",
       base::Bind(&TestService::Echo,
                  base::Unretained(this)),
       base::Bind(&TestService::OnExported,
                  base::Unretained(this)));
   ++num_methods;
@@ skipping 67 matching lines @@
                                   TestTimeouts::tiny_timeout_ms());
 }
 
 void TestService::BrokenMethod(
     MethodCall* method_call,
     dbus::ExportedObject::ResponseSender response_sender) {
   response_sender.Run(NULL);
 }
 
 }  // namespace dbus