Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_test_helper.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/settings/device_settings_test_helper.h"
 
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
-DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}
+DeviceSettingsTestHelper::DeviceSettingsTestHelper() {
+  // DeviceSettingsTestHelper is used both by browser tests (where CrosSettings
+  // is already initialized) and unit tests, where it is not.
+  if (!CrosSettings::IsInitialized())
+    test_cros_settings_.reset(new ScopedTestCrosSettings);
+}
 
-DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}
+DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {
+}
 
 void DeviceSettingsTestHelper::FlushLoops() {
   // DeviceSettingsService may trigger operations that hop back and forth
   // between the message loop and the blocking pool. 2 iterations are currently
   // sufficient (key loading, signing).
   for (int i = 0; i < 2; ++i) {
     MessageLoop::current()->RunUntilIdle();
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
   }
   MessageLoop::current()->RunUntilIdle();
@@ skipping 130 matching lines @@
   device_local_account_policy_[account_id].policy_blob_ = policy_blob;
   device_local_account_policy_[account_id].store_callbacks_.push_back(callback);
 }
 
 DeviceSettingsTestHelper::PolicyState::PolicyState()
     : store_result_(true) {}
 
 DeviceSettingsTestHelper::PolicyState::~PolicyState() {}
 
 ScopedDeviceSettingsTestHelper::ScopedDeviceSettingsTestHelper() {
-  DeviceSettingsService::Get()->Initialize(this, new MockOwnerKeyUtil());
+  DeviceSettingsService::Get()->InitializeSessionManager(
+      this, new MockOwnerKeyUtil());
   DeviceSettingsService::Get()->Load();
   Flush();
 }
 
 ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
   Flush();
-  DeviceSettingsService::Get()->Shutdown();
+  DeviceSettingsService::Get()->ShutdownSessionManager();
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
     : loop_(MessageLoop::TYPE_UI),
       ui_thread_(content::BrowserThread::UI, &loop_),
       file_thread_(content::BrowserThread::FILE, &loop_),
-      owner_key_util_(new MockOwnerKeyUtil()) {}
+      owner_key_util_(new MockOwnerKeyUtil()),
+      device_settings_service_(DeviceSettingsService::Get()) {
+}
 
 DeviceSettingsTestBase::~DeviceSettingsTestBase() {
   base::RunLoop().RunUntilIdle();
 }
 
 void DeviceSettingsTestBase::SetUp() {
   device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
       false);
   owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
-  device_settings_service_.Initialize(&device_settings_test_helper_,
-                                      owner_key_util_);
+  device_settings_service_->InitializeSessionManager(
+      &device_settings_test_helper_,
+      owner_key_util_);
 }
 
 void DeviceSettingsTestBase::TearDown() {
   FlushDeviceSettings();
-  device_settings_service_.Shutdown();
+  device_settings_service_->ShutdownSessionManager();
 }
 
 void DeviceSettingsTestBase::FlushDeviceSettings() {
   device_settings_test_helper_.Flush();
 }
 
 void DeviceSettingsTestBase::ReloadDeviceSettings() {
-  device_settings_service_.OwnerKeySet(true);
+  device_settings_service_->OwnerKeySet(true);
   FlushDeviceSettings();
 }
 
 }  // namespace chromeos