Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/parallel_authenticator.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 200 matching lines @@
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 
   std::string username_;
   std::string password_;
   std::string username_hash_;
   std::string hash_ascii_;
 
+  ScopedStubCrosEnabler stub_cros_enabler_;
   ScopedDeviceSettingsTestHelper device_settings_test_helper_;
-
-  // Initializes / shuts down a stub CrosLibrary.
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedTestCrosSettings test_cros_settings_;
 
   // Mocks, destroyed by CrosLibrary class.
   MockCertLibrary* mock_cert_library_;
   MockCryptohomeLibrary* mock_cryptohome_library_;
   ScopedMockUserManagerEnabler mock_user_manager_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
 
   MockConsumer consumer_;
   scoped_refptr<ParallelAuthenticator> auth_;
@@ skipping 91 matching lines @@
   state_->PresetCryptohomeStatus(true, cryptohome::MOUNT_ERROR_NONE);
   EXPECT_EQ(ParallelAuthenticator::OFFLINE_LOGIN,
             SetAndResolveState(auth_, state_.release()));
 }
 
 TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
   FailOnLoginSuccess();  // Set failing on success as the default...
   LoginFailure failure = LoginFailure(LoginFailure::OWNER_REQUIRED);
   ExpectLoginFailure(failure);
 
-  MockDBusThreadManager* mock_dbus_thread_manager =
-      new MockDBusThreadManager;
+  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);
   EXPECT_CALL(*mock_dbus_thread_manager->mock_cryptohome_client(), Unmount(_))
       .WillOnce(DoAll(SetArgPointee<0>(true), Return(true)));
 
   CrosSettingsProvider* device_settings_provider;
   StubCrosSettingsProvider stub_settings_provider;
   // Set up state as though a cryptohome mount attempt has occurred
   // and succeeded but we are in safe mode and the current user is not owner.
@@ skipping 449 matching lines @@
       .WillOnce(Return(std::string()))
       .RetiresOnSaturation();
 
   auth_->AuthenticateToUnlock(UserContext(username_,
                                           std::string(),
                                           std::string()));
   message_loop_.Run();
 }
 
 }  // namespace chromeos