Split UserCloudPolicyManager implementation.

chrome/browser/policy/cloud_policy_manager.h

Index: chrome/browser/policy/cloud_policy_manager.h
diff --git a/chrome/browser/policy/cloud_policy_manager.h b/chrome/browser/policy/cloud_policy_manager.h
index 82b73c6071bd9a6b9cf5a86002f01eda643f2328..93aa86ef5266e0efbbf75824d09f09911d0935c7 100644
--- a/chrome/browser/policy/cloud_policy_manager.h
+++ b/chrome/browser/policy/cloud_policy_manager.h
@@ -33,14 +33,14 @@ class CloudPolicyService;
 class CloudPolicyManager : public ConfigurationPolicyProvider,
                            public CloudPolicyStore::Observer {
  public:
-  explicit CloudPolicyManager(scoped_ptr<CloudPolicyStore> store);
+  explicit CloudPolicyManager(CloudPolicyStore* store);
   virtual ~CloudPolicyManager();
 
   CloudPolicyClient* cloud_policy_client() { return client_.get(); }
   const CloudPolicyClient* cloud_policy_client() const { return client_.get(); }
 
-  CloudPolicyStore* cloud_policy_store() { return store_.get(); }
-  const CloudPolicyStore* cloud_policy_store() const { return store_.get(); }
+  CloudPolicyStore* cloud_policy_store() { return store_; }
+  const CloudPolicyStore* cloud_policy_store() const { return store_; }
 
   CloudPolicyService* cloud_policy_service() { return service_.get(); }
   const CloudPolicyService* cloud_policy_service() const {
@@ -76,7 +76,7 @@ class CloudPolicyManager : public ConfigurationPolicyProvider,
   // Completion handler for policy refresh operations.
   void OnRefreshComplete();
 
-  scoped_ptr<CloudPolicyStore> store_;
+  CloudPolicyStore* store_;

[Andrew T Wilson (Slow), 2012/11/21 17:34:24]

Since we don't own this, and this will likely get freed before this object is
freed (since our derived class will hold a reference to it) we probably should
document the semantics of use (i.e. do not access this from our destructor).

Should probably also clear this out in Shutdown(). OR, just go back to the way
it was where this class owned a pointer to the CloudPolicyStore :)

[Mattias Nissler (ping if slow), 2012/11/22 20:51:59]

I changed the code to NULL store_ in Shutdown() and added a DCHECK(!store_) to
the dtor, so we should be well-covered.

   scoped_ptr<CloudPolicyClient> client_;
   scoped_ptr<CloudPolicyService> service_;
   scoped_ptr<CloudPolicyRefreshScheduler> refresh_scheduler_;