Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/cros_dbus_service_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 "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.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::Eq;
 using ::testing::Invoke;
 using ::testing::Return;
 
 namespace chromeos {
 
@@ skipping 17 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_bus_|'s GetExportedObject() will return mock_exported_object_|
     // for the given service name and the object path.
     EXPECT_CALL(*mock_bus_, GetExportedObject(
-        kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath)))
+        kLibCrosServiceName, kLibCrosServicePath))
         .WillOnce(Return(mock_exported_object_.get()));
 
     // Create a mock proxy resolution service.
     MockProxyResolutionService* mock_proxy_resolution_service_provider =
         new MockProxyResolutionService;
 
     // Start() will be called with |mock_exported_object_|.
     EXPECT_CALL(*mock_proxy_resolution_service_provider,
                 Start(Eq(mock_exported_object_))).WillOnce(Return());
 
@@ skipping 16 matching lines @@
 };
 
 TEST_F(CrosDBusServiceTest, Start) {
   // Simply start the service and see if mock expectations are met:
   // - The service object is exported by GetExportedObject()
   // - The proxy resolution service is started.
   cros_dbus_service_->Start();
 }
 
 }  // namespace chromeos