chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc - Issue 9826010: Made a ScopedMockUserManagerEnabler to simplify UserManager mocking life-cycle.

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/kiosk_mode/kiosk_mode_screensaver_unittest.cc

Issue 9826010: Made a ScopedMockUserManagerEnabler to simplify UserManager mocking life-cycle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 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/chromeos/cros_settings_unittest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

index 934a060e06c8e5bf46adab877272c5ee9d5b0667..575cdb0446ec5943aa89fe20ac31856999322171 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

@@ -45,9 +45,7 @@ class KioskModeScreensaverTest : public testing::Test {

}

virtual void SetUp() OVERRIDE {

- mock_user_manager_.reset(new MockUserManager());

- old_user_manager_ = UserManager::Set(mock_user_manager_.get());

- EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())

+ EXPECT_CALL(*mock_user_manager_.user_manager(), IsUserLoggedIn())

.Times(AnyNumber())

.WillRepeatedly(Return(false));

@@ -72,7 +70,6 @@ class KioskModeScreensaverTest : public testing::Test {

virtual void TearDown() OVERRIDE {

delete screensaver_;

- UserManager::Set(old_user_manager_);

DBusThreadManager::Shutdown();

}

@@ -92,8 +89,7 @@ class KioskModeScreensaverTest : public testing::Test {

MessageLoopForUI message_loop_;

content::TestBrowserThread ui_thread_;

- scoped_ptr<MockUserManager> mock_user_manager_;

- UserManager* old_user_manager_;

+ ScopedMockUserManagerEnabler mock_user_manager_;

KioskModeScreensaver* screensaver_;

content::NotificationRegistrar registrar_;