Move user cloud policy to BrowserProcess.

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
new file mode 100644
index 0000000000000000000000000000000000000000..ca8d5eaa7379e755ff72dc8a828dad43011e4e78
--- /dev/null
+++ b/chrome/browser/policy/cloud_policy_provider.cc
@@ -0,0 +1,129 @@
+// 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.
+
+#include "chrome/browser/policy/cloud_policy_provider.h"
+
+#include <set>
+
+#include "base/values.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/policy_notifier.h"
+
+namespace policy {
+
+CloudPolicyProvider::CloudPolicyProvider(
+    const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list,
+    CloudPolicyCacheBase::PolicyLevel level)
+  : ConfigurationPolicyProvider(policy_list),
+    level_(level) {}
+
+CloudPolicyProvider::~CloudPolicyProvider() {
+  for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i)
+    (*i)->RemoveObserver(this);
+
+  FOR_EACH_OBSERVER(ConfigurationPolicyProvider::Observer,
+                    observer_list_, OnProviderGoingAway());
+}
+
+namespace {

[Mattias Nissler (ping if slow), 2011/06/09 14:36:26]

please move this to the top.

[sfeuz, 2011/06/13 06:53:53]

Done.

+
+bool is_proxy_policy(ConfigurationPolicyType policy) {
+  return policy == kPolicyProxyMode ||
+         policy == kPolicyProxyServerMode ||
+         policy == kPolicyProxyServer ||
+         policy == kPolicyProxyPacUrl ||
+         policy == kPolicyProxyBypassList;
+}
+
+} // namespace
+
+void CloudPolicyProvider::CombineTwoPolicyMaps(const PolicyMap& base,

[Mattias Nissler (ping if slow), 2011/06/09 14:36:26]

You should order the function definitions according to their declaration order
in the header.

[sfeuz, 2011/06/13 06:53:53]

Done.

+                                               const PolicyMap& overlay,
+                                               PolicyMap* out_map) {
+  bool added_proxy_policy = false;
+  out_map->Clear();
+
+  for (PolicyMap::const_iterator i = base.begin(); i != base.end(); ++i) {
+    out_map->Set(i->first, i->second->DeepCopy());
+    added_proxy_policy = added_proxy_policy || (is_proxy_policy(i->first));

[Mattias Nissler (ping if slow), 2011/06/09 14:36:26]

parentheses around is_proxy_policy are not required.

[sfeuz, 2011/06/13 06:53:53]

Done.

+  }
+
+  // Add every entry of |overlay| which has not been added by |base|. Only add
+  // proxy policies if none of them was added by |base|.
+  for (PolicyMap::const_iterator i = overlay.begin(); i != overlay.end(); ++i) {
+    if (is_proxy_policy(i->first)) {
+      if (!added_proxy_policy) {
+        out_map->Set(i->first, i->second->DeepCopy());
+      }
+    } else if (!out_map->Get(i->first)) {
+      out_map->Set(i->first, i->second->DeepCopy());
+    }
+  }
+}
+
+void CloudPolicyProvider::RecombineCachesAndMaybeTriggerUpdate() {
+  PolicyMap newly_combined;
+  for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i) {
+    if (!(*i)->initialization_complete())
+      continue;
+    PolicyMap tmp_map;
+    CombineTwoPolicyMaps(newly_combined, *(*i)->policy(level_), &tmp_map);
+    newly_combined.Swap(&tmp_map);
+  }
+  if (newly_combined.Equals(combined))
+    return;
+
+  // Trigger a notification if there was a change.
+  combined.Swap(&newly_combined);
+  FOR_EACH_OBSERVER(ConfigurationPolicyProvider::Observer,
+                    observer_list_, OnUpdatePolicy());
+}
+
+bool CloudPolicyProvider::Provide(ConfigurationPolicyStoreInterface* store) {
+  ApplyPolicyMap(&combined, store);
+  return true;
+}
+
+bool CloudPolicyProvider::IsInitializationComplete() const {
+  return true;

[Mattias Nissler (ping if slow), 2011/06/09 14:36:26]

This seems wrong. I think the old code only returned true after policy has been
successfully loaded at least once.

[sfeuz, 2011/06/13 06:53:53]

Done.

+}
+
+void CloudPolicyProvider::AppendCache(CloudPolicyCacheBase* cache) {
+  cache->AddObserver(this);
+  caches_.push_back(cache);
+  RecombineCachesAndMaybeTriggerUpdate();
+}
+
+void CloudPolicyProvider::PrependCache(CloudPolicyCacheBase* cache) {
+  cache->AddObserver(this);
+  caches_.insert(caches_.begin(), cache);
+  RecombineCachesAndMaybeTriggerUpdate();
+}
+
+void CloudPolicyProvider::AddObserver(
+    ConfigurationPolicyProvider::Observer* observer) {
+  observer_list_.AddObserver(observer);
+}
+void CloudPolicyProvider::RemoveObserver(
+    ConfigurationPolicyProvider::Observer* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
+void CloudPolicyProvider::OnCacheUpdate(CloudPolicyCacheBase* cache) {
+  RecombineCachesAndMaybeTriggerUpdate();
+}
+
+void CloudPolicyProvider::OnCacheGoingAway(CloudPolicyCacheBase* cache) {
+  cache->RemoveObserver(this);
+  for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i) {
+    if (*i == cache) {
+      caches_.erase(i);
+      break;
+    }
+  }
+
+  RecombineCachesAndMaybeTriggerUpdate();
+}
+
+}  // namespace policy