| 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) {
|
|
|