Revert 121920 - dbus: add ObjectPath type

dbus/end_to_end_sync_unittest.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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The end-to-end test exercises the synchronous APIs in ObjectProxy and
 // ExportedObject. The test will launch a thread for the service side
 // operations (i.e. ExportedObject side).
 class EndToEndSyncTest : public testing::Test {
  public:
   EndToEndSyncTest() {
   }
 
   virtual void SetUp() {
     // Start the test service;
     dbus::TestService::Options options;
     test_service_.reset(new dbus::TestService(options));
     ASSERT_TRUE(test_service_->StartService());
     ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
     ASSERT_FALSE(test_service_->HasDBusThread());
 
     // Create the client.
     dbus::Bus::Options client_bus_options;
     client_bus_options.bus_type = dbus::Bus::SESSION;
     client_bus_options.connection_type = dbus::Bus::PRIVATE;
     client_bus_ = new dbus::Bus(client_bus_options);
-    object_proxy_ = client_bus_->GetObjectProxy(
-        "org.chromium.TestService",
-        dbus::ObjectPath("/org/chromium/TestObject"));
+    object_proxy_ = client_bus_->GetObjectProxy("org.chromium.TestService",
+                                                "/org/chromium/TestObject");
     ASSERT_FALSE(client_bus_->HasDBusThread());
   }
 
   virtual void TearDown() {
     test_service_->ShutdownAndBlock();
     test_service_->Stop();
     client_bus_->ShutdownAndBlock();
   }
 
  protected:
@@ skipping 49 matching lines @@
 }
 
 TEST_F(EndToEndSyncTest, BrokenMethod) {
   dbus::MethodCall method_call("org.chromium.TestInterface", "BrokenMethod");
 
   const int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT;
   scoped_ptr<dbus::Response> response(
       object_proxy_->CallMethodAndBlock(&method_call, timeout_ms));
   ASSERT_FALSE(response.get());
 }