Split UserCloudPolicyManager implementation.

chrome/browser/policy/device_cloud_policy_manager_chromeos.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/policy/device_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/policy/cloud_policy_client.h"
@@ skipping 31 matching lines @@
   "serial_number",  // VPD v2+ devices
   "Product_SN",     // Mario
   "sn",             // old ZGB devices (more recent ones use serial_number)
 };
 
 }  // namespace
 
 DeviceCloudPolicyManagerChromeOS::DeviceCloudPolicyManagerChromeOS(
     scoped_ptr<DeviceCloudPolicyStoreChromeOS> store,
     EnterpriseInstallAttributes* install_attributes)
-    : CloudPolicyManager(make_scoped_ptr<CloudPolicyStore>(store.get())),
-      device_store_(store.release()),  // Hack: retain |store| till here.
+    : CloudPolicyManager(store.get()),
+      device_store_(store.Pass()),
       install_attributes_(install_attributes),
       device_management_service_(NULL),
       local_state_(NULL) {}
 
 DeviceCloudPolicyManagerChromeOS::~DeviceCloudPolicyManagerChromeOS() {}
 
 void DeviceCloudPolicyManagerChromeOS::Connect(
     PrefService* local_state,
     DeviceManagementService* device_management_service) {
   CHECK(!device_management_service_);
   CHECK(device_management_service);
   CHECK(local_state);
 
   local_state_ = local_state;
   device_management_service_ = device_management_service;
 
   StartIfManaged();
 }
 
 void DeviceCloudPolicyManagerChromeOS::StartEnrollment(
     const std::string& auth_token,
     const AllowedDeviceModes& allowed_device_modes,
     const EnrollmentCallback& callback) {
   CHECK(device_management_service_);
   ShutdownService();
 
   enrollment_handler_.reset(
       new EnrollmentHandlerChromeOS(
-          device_store_, install_attributes_, CreateClient(), auth_token,
+          device_store_.get(), install_attributes_, CreateClient(), auth_token,
           allowed_device_modes,
           base::Bind(&DeviceCloudPolicyManagerChromeOS::EnrollmentCompleted,
                      base::Unretained(this), callback)));
   enrollment_handler_->StartEnrollment();
 }
 
 void DeviceCloudPolicyManagerChromeOS::CancelEnrollment() {
   if (enrollment_handler_.get()) {
     enrollment_handler_.reset();
     StartIfManaged();
@@ skipping 64 matching lines @@
       local_state_ &&
       cloud_policy_store()->is_initialized() &&
       cloud_policy_store()->is_managed() &&
       !cloud_policy_service()) {
     InitializeService(CreateClient());
     StartRefreshScheduler(local_state_, prefs::kDevicePolicyRefreshRate);
   }
 }
 
 }  // namespace policy