Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/mock_login_display.h"
 #include "chrome/browser/chromeos/login/mock_login_display_host.h"
 #include "chrome/browser/chromeos/login/mock_login_utils.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 100 matching lines @@
 
  private:
   // Owned by LoginUtilsWrapper.
   MockLoginUtils* mock_login_utils_;
 
   // |mock_login_display_| is owned by the ExistingUserController, which calls
   // CreateLoginDisplay() on the |mock_login_display_host_| to get it.
   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) {
   // Timer shouldn't start until signin screen is ready.
   set_auto_login_username(kAutoLoginUsername);
   set_auto_login_delay(kAutoLoginDelay2);
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Timer shouldn't start if the policy isn't set.
@@ skipping 101 matching lines @@
   ConfigureAutoLogin();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay2);
   EXPECT_EQ(auto_login_username(), "");
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2);
 }
 
 }  // namespace chromeos