Signed settings refactoring: Proper caching and more tests.

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 "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/chromeos/login/signed_settings_helper.h"

[Mattias Nissler (ping if slow), 2011/11/30 12:25:50]

Drop these includes and forward-declare SignedSettingsHelper instead?

[pastarmovj, 2011/11/30 17:21:16]

Done.

 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 
 namespace policy {
 
 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 {
+class DevicePolicyCache : public CloudPolicyCacheBase {
  public:
   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;
 
-  // SignedSettingsHelper::Callback implementation:
-  virtual void OnRetrievePolicyCompleted(
+  void OnRetrievePolicyCompleted(
       chromeos::SignedSettings::ReturnCode code,
       const em::PolicyFetchResponse& policy) OVERRIDE;

[Mattias Nissler (ping if slow), 2011/11/30 12:25:50]

this is no longer an override.

[pastarmovj, 2011/11/30 17:21:16]

Yeah clang already told me so :)

 
  private:
   friend class DevicePolicyCacheTest;
   friend class DevicePolicyCacheTestHelper;
 
   // Alternate c'tor allowing tests to mock out the SignedSettingsHelper
   // singleton.
   DevicePolicyCache(
       CloudPolicyDataStore* data_store,
       EnterpriseInstallAttributes* install_attributes,
@@ skipping 26 matching lines @@
   chromeos::SignedSettingsHelper* signed_settings_helper_;
 
   base::WeakPtrFactory<DevicePolicyCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCache);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_