Signed settings refactoring: Proper caching and more tests.

chrome/browser/policy/device_policy_cache.h

Index: chrome/browser/policy/device_policy_cache.h
diff --git a/chrome/browser/policy/device_policy_cache.h b/chrome/browser/policy/device_policy_cache.h
index 63ed1cedf2dfe8bf9d905f1ba6b142daa7a91659..4a2fd11ff1fc41c713f0939787d098701cda3aa7 100644
--- a/chrome/browser/policy/device_policy_cache.h
+++ b/chrome/browser/policy/device_policy_cache.h
@@ -8,10 +8,13 @@
 
 #include "base/memory/weak_ptr.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 chromeos {
+class SignedSettingsHelper;
+}  // namespace chromeos
+
 namespace policy {
 
 class CloudPolicyDataStore;
@@ -22,8 +25,7 @@ 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);
@@ -34,10 +36,8 @@ class DevicePolicyCache : public CloudPolicyCacheBase,
   virtual void SetPolicy(const em::PolicyFetchResponse& policy) OVERRIDE;
   virtual void SetUnmanaged() OVERRIDE;
 
-  // SignedSettingsHelper::Callback implementation:
-  virtual void OnRetrievePolicyCompleted(
-      chromeos::SignedSettings::ReturnCode code,
-      const em::PolicyFetchResponse& policy) OVERRIDE;
+  void OnRetrievePolicyCompleted(chromeos::SignedSettings::ReturnCode code,
+                                 const em::PolicyFetchResponse& policy);
 
  private:
   friend class DevicePolicyCacheTest;