Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 984d9a806fb4a7956739b278baa94e3baa4c1aa1..7e9d1fcd66ed2589e6c6a666b7c08e95ba35a997 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -55,16 +55,19 @@ class DeviceCloudPolicyManagerChromeOSTest
                             stub_cryptohome_client_.get()),
         store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
                                                   &install_attributes_)),
-        manager_(make_scoped_ptr(store_), &install_attributes_) {}
+        manager_(new DeviceCloudPolicyManagerChromeOS(make_scoped_ptr(store_),
+                                                      &install_attributes_)) {
+  }
 
   virtual void SetUp() OVERRIDE {
     DeviceSettingsTestBase::SetUp();
     chrome::RegisterLocalState(local_state_.registry());
-    manager_.Init();
+    manager_->Init();
   }
 
   virtual void TearDown() OVERRIDE {
-    manager_.Shutdown();
+    manager_->Shutdown();
+    manager_.reset();
     DeviceSettingsTestBase::TearDown();
   }
 
@@ -76,7 +79,7 @@ class DeviceCloudPolicyManagerChromeOSTest
   MockDeviceManagementService device_management_service_;
 
   DeviceCloudPolicyStoreChromeOS* store_;
-  DeviceCloudPolicyManagerChromeOS manager_;
+  scoped_ptr<DeviceCloudPolicyManagerChromeOS> manager_;

[Mattias Nissler (ping if slow), 2013/04/17 13:10:30]

Any reason this still needs to be wrapped in a scoped_ptr? If not, please revert
to a regular class member.

[stevenjb, 2013/04/17 16:27:12]

With the changes to DeviceSettingsTestBase I can revert these too. Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOSTest);
@@ -85,13 +88,13 @@ class DeviceCloudPolicyManagerChromeOSTest
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, FreshDevice) {
   owner_key_util_->Clear();
   FlushDeviceSettings();
-  EXPECT_TRUE(manager_.IsInitializationComplete(POLICY_DOMAIN_CHROME));
+  EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
 
-  manager_.Connect(&local_state_, &device_management_service_,
-                   scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
+  manager_->Connect(&local_state_, &device_management_service_,
+                    scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
 
   PolicyBundle bundle;
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 }
 
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {
@@ -106,7 +109,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {
 
   FlushDeviceSettings();
   EXPECT_EQ(CloudPolicyStore::STATUS_OK, store_->status());
-  EXPECT_TRUE(manager_.IsInitializationComplete(POLICY_DOMAIN_CHROME));
+  EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
 
   PolicyBundle bundle;
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
@@ -114,30 +117,30 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {
            POLICY_LEVEL_MANDATORY,
            POLICY_SCOPE_MACHINE,
            Value::CreateBooleanValue(false));
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 
-  manager_.Connect(&local_state_, &device_management_service_,
-                   scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  manager_->Connect(&local_state_, &device_management_service_,
+                    scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 
-  manager_.Shutdown();
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  manager_->Shutdown();
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 }
 
 TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConsumerDevice) {
   FlushDeviceSettings();
   EXPECT_EQ(CloudPolicyStore::STATUS_BAD_STATE, store_->status());
-  EXPECT_TRUE(manager_.IsInitializationComplete(POLICY_DOMAIN_CHROME));
+  EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
 
   PolicyBundle bundle;
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 
-  manager_.Connect(&local_state_, &device_management_service_,
-                   scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  manager_->Connect(&local_state_, &device_management_service_,
+                    scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 
-  manager_.Shutdown();
-  EXPECT_TRUE(manager_.policies().Equals(bundle));
+  manager_->Shutdown();
+  EXPECT_TRUE(manager_->policies().Equals(bundle));
 }
 
 class DeviceCloudPolicyManagerChromeOSEnrollmentTest
@@ -177,20 +180,20 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
     // Initialize the manager.
     FlushDeviceSettings();
     EXPECT_EQ(CloudPolicyStore::STATUS_BAD_STATE, store_->status());
-    EXPECT_TRUE(manager_.IsInitializationComplete(POLICY_DOMAIN_CHROME));
+    EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
 
     PolicyBundle bundle;
-    EXPECT_TRUE(manager_.policies().Equals(bundle));
+    EXPECT_TRUE(manager_->policies().Equals(bundle));
 
-    manager_.Connect(&local_state_, &device_management_service_,
-                     scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
+    manager_->Connect(&local_state_, &device_management_service_,
+                      scoped_ptr<CloudPolicyClient::StatusProvider>(NULL));
   }
 
   void ExpectFailedEnrollment(EnrollmentStatus::Status status) {
     EXPECT_EQ(status, status_.status());
     EXPECT_FALSE(store_->is_managed());
     PolicyBundle empty_bundle;
-    EXPECT_TRUE(manager_.policies().Equals(empty_bundle));
+    EXPECT_TRUE(manager_->policies().Equals(empty_bundle));
   }
 
   void ExpectSuccessfulEnrollment() {
@@ -198,8 +201,8 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
     EXPECT_EQ(DEVICE_MODE_ENTERPRISE, install_attributes_.GetMode());
     EXPECT_TRUE(store_->has_policy());
     EXPECT_TRUE(store_->is_managed());
-    ASSERT_TRUE(manager_.core()->client());
-    EXPECT_TRUE(manager_.core()->client()->is_registered());
+    ASSERT_TRUE(manager_->core()->client());
+    EXPECT_TRUE(manager_->core()->client()->is_registered());
 
     PolicyBundle bundle;
     bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
@@ -207,7 +210,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_MACHINE,
              Value::CreateBooleanValue(false));
-    EXPECT_TRUE(manager_.policies().Equals(bundle));
+    EXPECT_TRUE(manager_->policies().Equals(bundle));
   }
 
   void RunTest() {
@@ -223,7 +226,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
                         SaveArg<6>(&register_request_)));
     DeviceCloudPolicyManagerChromeOS::AllowedDeviceModes modes;
     modes[DEVICE_MODE_ENTERPRISE] = true;
-    manager_.StartEnrollment(
+    manager_->StartEnrollment(
         "auth token", is_auto_enrollment_, modes,
         base::Bind(&DeviceCloudPolicyManagerChromeOSEnrollmentTest::Done,
                    base::Unretained(this)));