Index: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
=================================================================== |
--- chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc (revision 121922) |
+++ chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc (working copy) |
@@ -20,7 +20,6 @@ |
#include "dbus/message.h" |
#include "dbus/mock_bus.h" |
#include "dbus/mock_object_proxy.h" |
-#include "dbus/object_path.h" |
#include "dbus/object_proxy.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -226,7 +225,7 @@ |
mock_klauncher_proxy_ = |
new dbus::MockObjectProxy(mock_session_bus_.get(), |
"org.kde.klauncher", |
- dbus::ObjectPath("/KLauncher")); |
+ "/KLauncher"); |
EXPECT_CALL(*mock_klauncher_proxy_, |
CallMethodAndBlock(_, _)) |
.WillRepeatedly(Invoke(this, |
@@ -235,7 +234,7 @@ |
mock_kwallet_proxy_ = |
new dbus::MockObjectProxy(mock_session_bus_.get(), |
"org.kde.kwalletd", |
- dbus::ObjectPath("/modules/kwalletd")); |
+ "/modules/kwalletd"); |
EXPECT_CALL(*mock_kwallet_proxy_, |
CallMethodAndBlock(_, _)) |
.WillRepeatedly(Invoke(this, |
@@ -243,11 +242,11 @@ |
EXPECT_CALL(*mock_session_bus_, GetObjectProxy( |
"org.kde.klauncher", |
- dbus::ObjectPath("/KLauncher"))) |
+ "/KLauncher")) |
.WillRepeatedly(Return(mock_klauncher_proxy_.get())); |
EXPECT_CALL(*mock_session_bus_, GetObjectProxy( |
"org.kde.kwalletd", |
- dbus::ObjectPath("/modules/kwalletd"))) |
+ "/modules/kwalletd")) |
.WillRepeatedly(Return(mock_kwallet_proxy_.get())); |
EXPECT_CALL(*mock_session_bus_, |