chromeos/dbus/mock_dbus_thread_manager.cc - Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network

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: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase + elim LoginState dependency 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:

Index: chromeos/dbus/mock_dbus_thread_manager.cc

diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc

index 2ef5f5817eec798e4ac8270163e67931009e0f4c..282d1fdc76bb890bb180297ce322597b42ce34aa 100644

--- a/chromeos/dbus/mock_dbus_thread_manager.cc

+++ b/chromeos/dbus/mock_dbus_thread_manager.cc

@@ -140,6 +140,8 @@ MockDBusThreadManager::MockDBusThreadManager()

EXPECT_CALL(*mock_cryptohome_client_.get(), GetSystemSalt(_))

.WillRepeatedly(DoAll(SetArgumentPointee<0>(*GetMockSystemSalt()),

Return(true)));

+ EXPECT_CALL(*mock_cryptohome_client_.get(), TpmIsEnabled(_))

+ .Times(AnyNumber());

// Called from GeolocationHandler::Init().

EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))