Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/cloud_policy_subsystem.h

Index: chrome/browser/policy/cloud_policy_subsystem.h
diff --git a/chrome/browser/policy/cloud_policy_subsystem.h b/chrome/browser/policy/cloud_policy_subsystem.h
index d88621640e59193c853d2ce6426fcd3e5bff10e5..060f410cf11697c48065c36b2ca56d727a0618ac 100644
--- a/chrome/browser/policy/cloud_policy_subsystem.h
+++ b/chrome/browser/policy/cloud_policy_subsystem.h
@@ -17,6 +17,7 @@ namespace policy {
 
 class CloudPolicyCacheBase;
 class CloudPolicyController;
+class CloudPolicyData;
 class CloudPolicyIdentityStrategy;

[Joao da Silva, 2011/07/06 16:45:14]

Nit: CloudPolicyIdentityStrategy is no more!

[gfeher, 2011/07/07 13:51:00]

Done.

 class DeviceManagementService;
 class DeviceTokenFetcher;
@@ -67,7 +68,7 @@ class CloudPolicySubsystem
     DISALLOW_COPY_AND_ASSIGN(ObserverRegistrar);
   };
 
-  CloudPolicySubsystem(CloudPolicyIdentityStrategy* identity_strategy,
+  CloudPolicySubsystem(CloudPolicyData* data,
                        CloudPolicyCacheBase* policy_cache);
   virtual ~CloudPolicySubsystem();
 
@@ -103,7 +104,7 @@ class CloudPolicySubsystem
 
   CloudPolicySubsystem();
 
-  void Initialize(CloudPolicyIdentityStrategy* identity_strategy,
+  void Initialize(CloudPolicyData* data,
                   CloudPolicyCacheBase* policy_cache,
                   const std::string& device_management_url);
 
@@ -129,8 +130,7 @@ class CloudPolicySubsystem
 
   PrefChangeRegistrar pref_change_registrar_;
 
-  // Weak reference to pass on to |cloud_policy_controller_| on creation.
-  CloudPolicyIdentityStrategy* identity_strategy_;
+  CloudPolicyData* cloud_policy_data_;
 
   // Cloud policy infrastructure stuff.
   scoped_ptr<PolicyNotifier> notifier_;