Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_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/policy/device_cloud_policy_store_chromeos.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
 
 class DeviceCloudPolicyStoreChromeOSTest
     : public chromeos::DeviceSettingsTestBase {
  protected:
   DeviceCloudPolicyStoreChromeOSTest()
       : cryptohome_library_(chromeos::CryptohomeLibrary::GetImpl(true)),
         stub_cryptohome_client_(chromeos::CryptohomeClient::Create(
             chromeos::STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),
         install_attributes_(new EnterpriseInstallAttributes(
             cryptohome_library_.get(), stub_cryptohome_client_.get())),
-        store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
+        store_(new DeviceCloudPolicyStoreChromeOS(device_settings_service_,
                                                   install_attributes_.get())) {}
 
   virtual void SetUp() OVERRIDE {
     DeviceSettingsTestBase::SetUp();
 
     base::RunLoop loop;
     EnterpriseInstallAttributes::LockResult result;
     install_attributes_->LockDevice(
         PolicyBuilder::kFakeUsername,
         DEVICE_MODE_ENTERPRISE,
@@ skipping 39 matching lines @@
     owner_key_util_->SetPublicKeyFromPrivateKey(
         device_policy_.new_signing_key());
   }
 
   void ResetToNonEnterprise() {
     store_.reset();
     cryptohome_library_->InstallAttributesSet("enterprise.owned",
                                               std::string());
     install_attributes_.reset(new EnterpriseInstallAttributes(
         cryptohome_library_.get(), stub_cryptohome_client_.get()));
-    store_.reset(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
+    store_.reset(new DeviceCloudPolicyStoreChromeOS(device_settings_service_,
                                                     install_attributes_.get()));
   }
 
   scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_library_;
   scoped_ptr<chromeos::CryptohomeClient> stub_cryptohome_client_;
   scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
 
   scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_;
 
  private:
@@ skipping 95 matching lines @@
 
 TEST_F(DeviceCloudPolicyStoreChromeOSTest, InstallInitialPolicyNotEnterprise) {
   PrepareNewSigningKey();
   ResetToNonEnterprise();
   store_->InstallInitialPolicy(device_policy_.policy());
   FlushDeviceSettings();
   ExpectFailure(CloudPolicyStore::STATUS_BAD_STATE);
 }
 
 }  // namespace policy