chrome/browser/chromeos/login/screen_locker_browsertest.cc - Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus().

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/chromeos/login/screen_locker_browsertest.cc

Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix the build for sure Created 8 years, 4 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: chrome/browser/chromeos/login/screen_locker_browsertest.cc

diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc

index 97fa70b1e36faa5c8b9e095892edd84db97ceded..b310186265a42b3783a1b29fe0da695d1bcee9e8 100644

--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc

+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc

@@ -105,6 +105,8 @@ class ScreenLockerTest : public CrosInProcessBrowserTest {

virtual void SetUpInProcessBrowserTestFixture() {

MockDBusThreadManager* mock_dbus_thread_manager =

new MockDBusThreadManager;

+ EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())

+ .WillRepeatedly(testing::Return(reinterpret_cast<dbus::Bus*>(NULL)));

DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);

CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();

mock_power_manager_client_ = static_cast<MockPowerManagerClient*>(