Refactored the CloudPolicyProvider so that it becomes initialized once and stays initialized.

chrome/browser/policy/cloud_policy_provider.cc

Index: chrome/browser/policy/cloud_policy_provider.cc
diff --git a/chrome/browser/policy/cloud_policy_provider.cc b/chrome/browser/policy/cloud_policy_provider.cc
index a5f5c2c204ac6234895f3d98507208f20884c11c..f595a6a0ae81b1c4bd65a1e6a91c365c6cbf0e71 100644
--- a/chrome/browser/policy/cloud_policy_provider.cc
+++ b/chrome/browser/policy/cloud_policy_provider.cc
@@ -4,14 +4,106 @@
 
 #include "chrome/browser/policy/cloud_policy_provider.h"
 
+#include "chrome/browser/policy/browser_policy_connector.h"
+
 namespace policy {
 
 CloudPolicyProvider::CloudPolicyProvider(
-    const PolicyDefinitionList* policy_list)
-    : ConfigurationPolicyProvider(policy_list) {
+    BrowserPolicyConnector* browser_policy_connector,
+    const PolicyDefinitionList* policy_list,
+    PolicyLevel level)
+    : ConfigurationPolicyProvider(policy_list),
+      browser_policy_connector_(browser_policy_connector),
+      level_(level),
+      initialization_complete_(false) {
+  for (size_t i = 0; i < CACHE_SIZE; ++i)
+    caches_[i] = NULL;
 }
 
 CloudPolicyProvider::~CloudPolicyProvider() {
+  for (size_t i = 0; i < CACHE_SIZE; ++i) {
+    if (caches_[i])
+      caches_[i]->RemoveObserver(this);
+  }
+}
+
+void CloudPolicyProvider::SetUserPolicyCache(CloudPolicyCacheBase* cache) {
+  DCHECK(!caches_[CACHE_USER]);
+  caches_[CACHE_USER] = cache;
+  cache->AddObserver(this);
+  Merge();
+}
+
+#if defined(OS_CHROMEOS)
+void CloudPolicyProvider::SetDevicePolicyCache(CloudPolicyCacheBase* cache) {
+  DCHECK(caches_[CACHE_DEVICE] == NULL);
+  caches_[CACHE_DEVICE] = cache;
+  cache->AddObserver(this);
+  Merge();
+}
+#endif
+
+bool CloudPolicyProvider::ProvideInternal(PolicyMap* result) {
+  result->CopyFrom(combined_);
+  return true;
+}
+
+bool CloudPolicyProvider::IsInitializationComplete() const {
+  return initialization_complete_;
+}
+
+void CloudPolicyProvider::RefreshPolicies() {
+  for (size_t i = 0; i < CACHE_SIZE; ++i) {
+    if (caches_[i])
+      pending_updates_.insert(caches_[i]);
+  }
+  if (pending_updates_.empty())
+    NotifyPolicyUpdated();
+  else
+    browser_policy_connector_->FetchCloudPolicy();
+}
+
+void CloudPolicyProvider::OnCacheUpdate(CloudPolicyCacheBase* cache) {
+  pending_updates_.erase(cache);
+  Merge();
+}
+
+void CloudPolicyProvider::OnCacheGoingAway(CloudPolicyCacheBase* cache) {
+  for (size_t i = 0; i < CACHE_SIZE; ++i) {
+    if (caches_[i] == cache) {
+      caches_[i] = NULL;
+      cache->RemoveObserver(this);
+      pending_updates_.erase(cache);
+      Merge();
+      return;
+    }
+  }
+  NOTREACHED();
+}
+
+void CloudPolicyProvider::Merge() {
+  // Re-check whether all caches are ready.
+  if (!initialization_complete_) {
+    initialization_complete_ = true;
+    for (size_t i = 0; i < CACHE_SIZE; ++i) {
+      if (caches_[i] == NULL || !caches_[i]->IsReady()) {
+        initialization_complete_ = false;
+        break;
+      }
+    }
+  }
+
+  combined_.Clear();
+  for (size_t i = 0; i < CACHE_SIZE; ++i) {
+    if (caches_[i] && caches_[i]->IsReady())
+      combined_.MergeFrom(*caches_[i]->policy());
+  }
+  FixDeprecatedPolicies(&combined_);
+  combined_.FilterLevel(level_);
+
+  // Trigger a notification.
+  if (pending_updates_.empty())
+    NotifyPolicyUpdated();
 }
 
 }  // namespace policy