Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/device_policy_cache.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_DEVICE_POLICY_CACHE_H_
 #define CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_
 #pragma once
 
-#include <string>
-
 #include "base/memory/scoped_callback_factory.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/chromeos/login/signed_settings_helper.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 
 namespace policy {
 
-class DevicePolicyIdentityStrategy;
+class CloudPolicyDataStore;
 class EnterpriseInstallAttributes;
 class PolicyMap;
 
 namespace em = enterprise_management;
 
 // CloudPolicyCacheBase implementation that persists policy information
 // to ChromeOS' session manager (via SignedSettingsHelper).
 class DevicePolicyCache : public CloudPolicyCacheBase,
                           public chromeos::SignedSettingsHelper::Callback {
  public:
-  explicit DevicePolicyCache(DevicePolicyIdentityStrategy* identity_strategy,
+  explicit DevicePolicyCache(CloudPolicyDataStore* data_store,
                              EnterpriseInstallAttributes* install_attributes);
   virtual ~DevicePolicyCache();
 
   // CloudPolicyCacheBase implementation:
   virtual void Load() OVERRIDE;
   virtual void SetPolicy(const em::PolicyFetchResponse& policy) OVERRIDE;
   virtual void SetUnmanaged() OVERRIDE;
   virtual bool IsReady() OVERRIDE;
 
   // SignedSettingsHelper::Callback implementation:
   virtual void OnRetrievePolicyCompleted(
       chromeos::SignedSettings::ReturnCode code,
       const em::PolicyFetchResponse& policy) OVERRIDE;
 
  private:
   friend class DevicePolicyCacheTest;
 
   // Alternate c'tor allowing tests to mock out the SignedSettingsHelper
   // singleton.
   DevicePolicyCache(
-      DevicePolicyIdentityStrategy* identity_strategy,
+      CloudPolicyDataStore* data_store,
       EnterpriseInstallAttributes* install_attributes,
       chromeos::SignedSettingsHelper* signed_settings_helper);
 
   // CloudPolicyCacheBase implementation:
   virtual bool DecodePolicyData(const em::PolicyData& policy_data,
                                 PolicyMap* mandatory,
                                 PolicyMap* recommended) OVERRIDE;
 
   void PolicyStoreOpCompleted(chromeos::SignedSettings::ReturnCode code);
 
   // Checks with immutable attributes whether this is an enterprise device and
   // read the registration user if this is the case.
   void CheckImmutableAttributes();
 
   static void DecodeDevicePolicy(const em::ChromeDeviceSettingsProto& policy,
                                  PolicyMap* mandatory,
                                  PolicyMap* recommended);
 
-  DevicePolicyIdentityStrategy* identity_strategy_;
+  CloudPolicyDataStore* data_store_;
   EnterpriseInstallAttributes* install_attributes_;
 
   chromeos::SignedSettingsHelper* signed_settings_helper_;
 
   bool starting_up_;
 
   base::ScopedCallbackFactory<DevicePolicyCache> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCache);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_