Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/proxy_resolution_service_provider_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.
 //
 // This test is relatively complicated. Here's the summary of what it does:
 //
 // - Set up mock D-Bus related objects to mock out D-Bus calls.
 // - Set up a mock proxy resolver to mock out the proxy resolution.
 // - Create ProxyResolutionServiceProvider by injecting the mocks
 // - Start the service provider.
 // - Request ProxyResolutionServiceProvider to resolve proxy for kSourceURL.
 // - ProxyResolutionServiceProvider will return the result as a signal.
 // - Confirm that we receive the signal and check the contents of the signal.
 
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "dbus/message.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_exported_object.h"
 #include "dbus/mock_object_proxy.h"
-#include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::Unused;
 
 namespace chromeos {
@@ skipping 38 matching lines @@
     mock_bus_ = new dbus::MockBus(options);
 
     // ShutdownAndBlock() will be called in TearDown().
     EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
 
     // Create a mock exported object that behaves as
     // org.chromium.CrosDBusService.
     mock_exported_object_ =
         new dbus::MockExportedObject(mock_bus_.get(),
                                      kLibCrosServiceName,
-                                     dbus::ObjectPath(kLibCrosServicePath));
+                                     kLibCrosServicePath);
 
     // |mock_exported_object_|'s ExportMethod() will use
     // |MockExportedObject().
     EXPECT_CALL(
         *mock_exported_object_,
         ExportMethod(_, _, _, _)).WillOnce(
             Invoke(this,
                    &ProxyResolutionServiceProviderTest::MockExportMethod));
     // |mock_exported_object_|'s SendSignal() will use
     // |MockSendSignal().
     EXPECT_CALL(
         *mock_exported_object_,
         SendSignal(_)).WillOnce(
             Invoke(this,
                    &ProxyResolutionServiceProviderTest::MockSendSignal));
 
     // Create a mock object proxy, with which we call a method of
     // |mock_exported_object_|.
     mock_object_proxy_ =
         new dbus::MockObjectProxy(mock_bus_.get(),
                                   kLibCrosServiceName,
-                                  dbus::ObjectPath(kLibCrosServicePath));
+                                  kLibCrosServicePath);
     // |mock_object_proxy_|'s CallMethodAndBlock() will use
     // MockCallMethodAndBlock() to return responses.
     EXPECT_CALL(*mock_object_proxy_,
                 CallMethodAndBlock(_, _))
         .WillOnce(Invoke(
             this,
             &ProxyResolutionServiceProviderTest::MockCallMethodAndBlock));
     // |mock_object_proxy_|'s ConnectToSignal will use
     // MockConnectToSignal().
     EXPECT_CALL(*mock_object_proxy_,
@@ skipping 205 matching lines @@
   ASSERT_TRUE(response.get());
   dbus::MessageReader reader(response.get());
   ASSERT_FALSE(reader.HasMoreData());
 
   // Confirm that the signal is received successfully.
   // The contents of the signal are checked in OnSignalReceived().
   ASSERT_TRUE(signal_received_successfully_);
 }
 
 }  // namespace chromeos