Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/policy/device_local_account_policy_service_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_local_account_policy_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
@@ skipping 23 matching lines @@
     : public DeviceLocalAccountPolicyService::Observer {
  public:
   MOCK_METHOD1(OnPolicyUpdated, void(const std::string&));
   MOCK_METHOD0(OnDeviceLocalAccountsChanged, void(void));
 };
 
 class DeviceLocalAccountPolicyServiceTest
     : public chromeos::DeviceSettingsTestBase {
  public:
   DeviceLocalAccountPolicyServiceTest()
-      : service_(&device_settings_test_helper_, &device_settings_service_) {}
+      : service_(&device_settings_test_helper_, device_settings_service_) {}
 
   virtual void SetUp() OVERRIDE {
     DeviceSettingsTestBase::SetUp();
 
     // Values implicitly enforced for public accounts.
     expected_policy_map_.Set(key::kLidCloseAction,
                              POLICY_LEVEL_MANDATORY,
                              POLICY_SCOPE_USER,
                              base::Value::CreateIntegerValue(
                                  chromeos::PowerPolicyController::
@@ skipping 186 matching lines @@
 
 TEST_F(DeviceLocalAccountPolicyServiceTest, DevicePolicyChange) {
   device_settings_test_helper_.set_device_local_account_policy_blob(
       PolicyBuilder::kFakeUsername, device_local_account_policy_.GetBlob());
   InstallDevicePolicy();
 
   EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged());
   device_policy_.payload().mutable_device_local_accounts()->clear_account();
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
-  device_settings_service_.PropertyChangeComplete(true);
+  device_settings_service_->PropertyChangeComplete(true);
   FlushDeviceSettings();
   EXPECT_FALSE(service_.GetBrokerForAccount(PolicyBuilder::kFakeUsername));
   Mock::VerifyAndClearExpectations(&service_observer_);
 }
 
 TEST_F(DeviceLocalAccountPolicyServiceTest, DuplicateAccounts) {
   InstallDevicePolicy();
   DeviceLocalAccountPolicyBroker* broker =
       service_.GetBrokerForAccount(PolicyBuilder::kFakeUsername);
   ASSERT_TRUE(broker);
 
   // Add a second entry with a duplicate account name to device policy.
   device_policy_.payload().mutable_device_local_accounts()->add_account()->
       set_id(PolicyBuilder::kFakeUsername);
   device_policy_.Build();
   device_settings_test_helper_.set_device_local_account_policy_blob(
       PolicyBuilder::kFakeUsername, device_local_account_policy_.GetBlob());
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
 
   EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged());
   EXPECT_CALL(service_observer_, OnPolicyUpdated(PolicyBuilder::kFakeUsername));
-  device_settings_service_.PropertyChangeComplete(true);
+  device_settings_service_->PropertyChangeComplete(true);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&service_observer_);
 
   // Make sure the broker is accessible and policy got loaded.
   broker = service_.GetBrokerForAccount(PolicyBuilder::kFakeUsername);
   ASSERT_TRUE(broker);
   EXPECT_EQ(PolicyBuilder::kFakeUsername, broker->account_id());
   EXPECT_TRUE(broker->core()->store()->policy());
 }
 
@@ skipping 264 matching lines @@
   ASSERT_TRUE(request_job);
   em::DeviceManagementResponse response;
   response.mutable_policy_response()->add_response()->CopyFrom(
       device_local_account_policy_.policy());
   request_job->SendResponse(DM_STATUS_SUCCESS, response);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 }
 
 }  // namespace policy