Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

Index: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 479c1eab26f7cb75cb44f23e7c998d7301120e72..e33cd6545eb5297d273953d8fad0b4595f2eb820 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -49,7 +49,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {
         new DeviceSettingsProvider(
             base::Bind(&DeviceSettingsProviderTest::SettingChanged,
                        base::Unretained(this)),
-            &device_settings_service_));
+            device_settings_service_));
     Mock::VerifyAndClearExpectations(this);
   }
 
@@ -141,7 +141,8 @@ TEST_F(DeviceSettingsProviderTest, SetPrefFailed) {
 
 TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {
   owner_key_util_->SetPrivateKey(device_policy_.signing_key());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  device_settings_service_->SetUsername(
+      device_policy_.policy_data().username());
   FlushDeviceSettings();
 
   base::FundamentalValue value(true);
@@ -155,8 +156,8 @@ TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {
   FlushDeviceSettings();
 
   // Verify that the device policy has been adjusted.
-  ASSERT_TRUE(device_settings_service_.device_settings());
-  EXPECT_TRUE(device_settings_service_.device_settings()->
+  ASSERT_TRUE(device_settings_service_->device_settings());
+  EXPECT_TRUE(device_settings_service_->device_settings()->
                   metrics_enabled().metrics_enabled());
 
   // Verify the change has been applied.
@@ -169,7 +170,8 @@ TEST_F(DeviceSettingsProviderTest, SetPrefSucceed) {
 
 TEST_F(DeviceSettingsProviderTest, SetPrefTwice) {
   owner_key_util_->SetPrivateKey(device_policy_.signing_key());
-  device_settings_service_.SetUsername(device_policy_.policy_data().username());
+  device_settings_service_->SetUsername(
+      device_policy_.policy_data().username());
   FlushDeviceSettings();
 
   EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());
@@ -198,7 +200,7 @@ TEST_F(DeviceSettingsProviderTest, PolicyRetrievalFailedBadSignature) {
 
   // Verify that the cached settings blob is not "trusted".
   EXPECT_EQ(DeviceSettingsService::STORE_VALIDATION_ERROR,
-            device_settings_service_.status());
+            device_settings_service_->status());
   EXPECT_EQ(CrosSettingsProvider::PERMANENTLY_UNTRUSTED,
             provider_->PrepareTrustedValues(base::Closure()));
 }
@@ -210,7 +212,7 @@ TEST_F(DeviceSettingsProviderTest, PolicyRetrievalNoPolicy) {
 
   // Verify that the cached settings blob is not "trusted".
   EXPECT_EQ(DeviceSettingsService::STORE_NO_POLICY,
-            device_settings_service_.status());
+            device_settings_service_->status());
   EXPECT_EQ(CrosSettingsProvider::PERMANENTLY_UNTRUSTED,
             provider_->PrepareTrustedValues(base::Closure()));
 }