chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc - Issue 9363045: Revert 121920 - dbus: add ObjectPath type

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

Issue 9363045: Revert 121920 - dbus: add ObjectPath type (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/password_manager/native_backend_kwallet_x.cc ('k') | content/browser/geolocation/wifi_data_provider_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_,