chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc - Issue 16296002: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

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 16296002: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 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/notifications/sync_notifier/synced_notification.cc ('k') | chrome/browser/password_manager/password_manager_unittest.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

diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

index 0da3455b03ccda0c6298f138acd5bc4ba8aa9a49..f502a3c982b59b038cec28ec6e5cb581cf3708b7 100644

--- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

+++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

@@ -250,31 +250,29 @@ void NativeBackendKWalletTest::SetUp() {

new dbus::MockObjectProxy(mock_session_bus_.get(),

"org.kde.klauncher",

dbus::ObjectPath("/KLauncher"));

- EXPECT_CALL(*mock_klauncher_proxy_,

- MockCallMethodAndBlock(_, _))

- .WillRepeatedly(Invoke(this,

- &NativeBackendKWalletTest::KLauncherMethodCall));

+ EXPECT_CALL(*mock_klauncher_proxy_.get(), MockCallMethodAndBlock(_, _))

+ .WillRepeatedly(

+ Invoke(this, &NativeBackendKWalletTest::KLauncherMethodCall));

mock_kwallet_proxy_ =

new dbus::MockObjectProxy(mock_session_bus_.get(),

"org.kde.kwalletd",

dbus::ObjectPath("/modules/kwalletd"));

- EXPECT_CALL(*mock_kwallet_proxy_,

- MockCallMethodAndBlock(_, _))

- .WillRepeatedly(Invoke(this,

- &NativeBackendKWalletTest::KWalletMethodCall));

- EXPECT_CALL(*mock_session_bus_, GetObjectProxy(

- "org.kde.klauncher",

- dbus::ObjectPath("/KLauncher")))

+ EXPECT_CALL(*mock_kwallet_proxy_.get(), MockCallMethodAndBlock(_, _))

+ .WillRepeatedly(

+ Invoke(this, &NativeBackendKWalletTest::KWalletMethodCall));

+ EXPECT_CALL(

+ *mock_session_bus_.get(),

+ GetObjectProxy("org.kde.klauncher", dbus::ObjectPath("/KLauncher")))

.WillRepeatedly(Return(mock_klauncher_proxy_.get()));

- EXPECT_CALL(*mock_session_bus_, GetObjectProxy(

- "org.kde.kwalletd",

- dbus::ObjectPath("/modules/kwalletd")))

+ EXPECT_CALL(

+ *mock_session_bus_.get(),

+ GetObjectProxy("org.kde.kwalletd", dbus::ObjectPath("/modules/kwalletd")))

.WillRepeatedly(Return(mock_kwallet_proxy_.get()));

- EXPECT_CALL(*mock_session_bus_,

- ShutdownAndBlock()).WillOnce(Return()).WillRepeatedly(Return());

+ EXPECT_CALL(*mock_session_bus_.get(), ShutdownAndBlock()).WillOnce(Return())

+ .WillRepeatedly(Return());

}

void NativeBackendKWalletTest::TearDown() {