Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/cloud_policy_subsystem.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/common/notification_observer.h"
 #include "net/base/network_change_notifier.h"
 
 class PrefService;
 
 namespace policy {
 
 class CloudPolicyCacheBase;
 class CloudPolicyController;
-class CloudPolicyIdentityStrategy;
+class CloudPolicyDataStore;
 class DeviceManagementService;
 class DeviceTokenFetcher;
 class PolicyNotifier;
 
 // This class is a container for the infrastructure required to support cloud
 // policy. It glues together the backend, the policy controller and manages the
 // life cycle of the policy providers.
 class CloudPolicySubsystem
     : public NotificationObserver,
       public net::NetworkChangeNotifier::IPAddressObserver {
@@ skipping 29 matching lines @@
     ObserverRegistrar(CloudPolicySubsystem* cloud_policy_subsystem,
                       CloudPolicySubsystem::Observer* observer);
     ~ObserverRegistrar();
 
    private:
     PolicyNotifier* policy_notifier_;
     CloudPolicySubsystem::Observer* observer_;
     DISALLOW_COPY_AND_ASSIGN(ObserverRegistrar);
   };
 
-  CloudPolicySubsystem(CloudPolicyIdentityStrategy* identity_strategy,
+  CloudPolicySubsystem(CloudPolicyDataStore* data_store,
                        CloudPolicyCacheBase* policy_cache);
   virtual ~CloudPolicySubsystem();
 
   // net::NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
   // Initializes the subsystem. The first network request will only be made
   // after |delay_milliseconds|. It can be scheduled to be happen earlier by
   // calling |ScheduleInitialization|.
   void CompleteInitialization(const char* refresh_pref_name,
@@ skipping 15 matching lines @@
   static void RegisterPrefs(PrefService* pref_service);
 
   // Schedule initialization of the policy backend service.
   void ScheduleServiceInitialization(int64 delay_milliseconds);
 
  private:
   friend class TestingCloudPolicySubsystem;
 
   CloudPolicySubsystem();
 
-  void Initialize(CloudPolicyIdentityStrategy* identity_strategy,
+  void Initialize(CloudPolicyDataStore* data_store,
                   CloudPolicyCacheBase* policy_cache,
                   const std::string& device_management_url);
 
   // Updates the policy controller with a new refresh rate value.
   void UpdatePolicyRefreshRate(int64 refresh_rate);
 
   // Returns a weak pointer to this subsystem's PolicyNotifier.
   PolicyNotifier* notifier() {
     return notifier_.get();
   }
 
   // Factory methods that may be overridden in tests.
   virtual void CreateDeviceTokenFetcher();
   virtual void CreateCloudPolicyController();
 
   // NotificationObserver overrides.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Name of the preference to read the refresh rate from.
   const char* refresh_pref_name_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
-  // Weak reference to pass on to |cloud_policy_controller_| on creation.
-  CloudPolicyIdentityStrategy* identity_strategy_;
+  CloudPolicyDataStore* data_store_;
 
   // Cloud policy infrastructure stuff.
   scoped_ptr<PolicyNotifier> notifier_;
   scoped_ptr<DeviceManagementService> device_management_service_;
   scoped_ptr<DeviceTokenFetcher> device_token_fetcher_;
   scoped_ptr<CloudPolicyCacheBase> cloud_policy_cache_;
   scoped_ptr<CloudPolicyController> cloud_policy_controller_;
 
   std::string device_management_url_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicySubsystem);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_