chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

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_auto_login_unittest.cc

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

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

index b519df4cc1a5805b82e5cda7f8c95d5cde62c774..c838c2b12f390e6ea18506af72c31b1cc3ae52bd 100644

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

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

@@ -118,11 +118,17 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {

MockLoginDisplay* mock_login_display_;

scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;

- scoped_ptr<ExistingUserController> existing_user_controller_;

MessageLoop message_loop_;

content::TestBrowserThread ui_thread_;

ScopedTestingLocalState local_state_;

+ // Required by ExistingUserController:

ScopedDeviceSettingsTestHelper device_settings_test_helper_;

+ ScopedTestCrosSettings test_cros_settings_;

+ // |existing_user_controller_| must be destroyed before

+ // |device_settings_test_helper_|.

+ scoped_ptr<ExistingUserController> existing_user_controller_;

};

TEST_F(ExistingUserControllerAutoLoginTest, StartAutoLoginTimer) {