chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 10832258: 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/existing_user_controller_browsertest.cc

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

Patch Set: 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:

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

Download patch

« chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('K') | « chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc ('k') | chrome/browser/chromeos/login/network_screen_browsertest.cc » ('j') | chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

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

index c55d0502ca7a4df85f5cc6cf592ac788a302dfa7..cbbb56f9144582b505d1a81c91f39114ea4d8906 100644

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

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

@@ -110,6 +110,8 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest {

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

MockDBusThreadManager* mock_dbus_thread_manager =

new MockDBusThreadManager;

+ EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())

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

DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);

CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();

cros_mock_->InitStatusAreaMocks();