Index: dbus/mock_unittest.cc |
diff --git a/dbus/mock_unittest.cc b/dbus/mock_unittest.cc |
index 022b03ded2849f05799b2b33bd23d45fc03b61a7..cf644df0d861bc67dea4dba9cce47f82f0725cf2 100644 |
--- a/dbus/mock_unittest.cc |
+++ b/dbus/mock_unittest.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// 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. |
@@ -11,6 +11,7 @@ |
#include "dbus/mock_bus.h" |
#include "dbus/mock_object_proxy.h" |
#include "dbus/mock_exported_object.h" |
+#include "dbus/object_path.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -31,9 +32,10 @@ class MockTest : public testing::Test { |
mock_bus_ = new dbus::MockBus(options); |
// Create a mock proxy. |
- mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), |
- "org.chromium.TestService", |
- "/org/chromium/TestObject"); |
+ mock_proxy_ = new dbus::MockObjectProxy( |
+ mock_bus_.get(), |
+ "org.chromium.TestService", |
+ dbus::ObjectPath("/org/chromium/TestObject")); |
// Set an expectation so mock_proxy's CallMethodAndBlock() will use |
// CreateMockProxyResponse() to return responses. |
@@ -49,8 +51,9 @@ class MockTest : public testing::Test { |
// Set an expectation so mock_bus's GetObjectProxy() for the given |
// service name and the object path will return mock_proxy_. |
- EXPECT_CALL(*mock_bus_, GetObjectProxy("org.chromium.TestService", |
- "/org/chromium/TestObject")) |
+ EXPECT_CALL(*mock_bus_, GetObjectProxy( |
+ "org.chromium.TestService", |
+ dbus::ObjectPath("/org/chromium/TestObject"))) |
.WillOnce(Return(mock_proxy_.get())); |
// ShutdownAndBlock() will be called in TearDown(). |
@@ -130,7 +133,7 @@ TEST_F(MockTest, CallMethodAndBlock) { |
// Get an object proxy from the mock bus. |
dbus::ObjectProxy* proxy = mock_bus_->GetObjectProxy( |
"org.chromium.TestService", |
- "/org/chromium/TestObject"); |
+ dbus::ObjectPath("/org/chromium/TestObject")); |
// Create a method call. |
dbus::MethodCall method_call("org.chromium.TestInterface", "Echo"); |
@@ -159,7 +162,7 @@ TEST_F(MockTest, CallMethod) { |
// Get an object proxy from the mock bus. |
dbus::ObjectProxy* proxy = mock_bus_->GetObjectProxy( |
"org.chromium.TestService", |
- "/org/chromium/TestObject"); |
+ dbus::ObjectPath("/org/chromium/TestObject")); |
// Create a method call. |
dbus::MethodCall method_call("org.chromium.TestInterface", "Echo"); |