Move user cloud policy to BrowserProcess.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 958f805d366558b7c2862123cf10dd49485b3bc8..62c3d2adb5a86ad578717fb64bb6fba947722cf1 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -43,6 +43,9 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/cloud_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/user_policy_connector.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
@@ -126,6 +129,9 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
       created_devtools_manager_(false),
       created_sidebar_manager_(false),
       created_browser_policy_connector_(false),
+      created_user_policy_connector_(false),
+      created_managed_cloud_policy_provider_(false),
+      created_recommended_cloud_policy_provider_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
@@ -224,6 +230,9 @@ BrowserProcessImpl::~BrowserProcessImpl() {
   // The policy providers managed by |browser_policy_connector_| need to shut
   // down while the IO and FILE threads are still alive.
   browser_policy_connector_.reset();
+  user_policy_connector_.reset();
+  managed_cloud_policy_provider_.reset();
+  recommended_cloud_policy_provider_.reset();
 
 #if defined(USE_X11)
   // The IO thread must outlive the BACKGROUND_X11 thread.
@@ -530,6 +539,71 @@ policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
   return browser_policy_connector_.get();
 }
 
+policy::UserPolicyConnector* BrowserProcessImpl::user_policy_connector() {
+  DCHECK(CalledOnValidThread());
+  if (!created_user_policy_connector_) {

[Joao da Silva, 2011/05/31 14:50:23]

Why have a boolean for this test, instead of testing the scoped_ptr?
Something like:

if (!user_policy_connector_.get()) {
  user_policy_connector_.reset(policy::UserPolicyConnector::Create());
}

[sfeuz, 2011/06/03 08:30:35]

Obsolete.
But still the same is done in browser_policy_connector. I actually dont know
exactly why...

+    DCHECK(user_policy_connector_.get() == NULL);
+    created_user_policy_connector_ = true;
+    user_policy_connector_.reset(policy::UserPolicyConnector::Create());
+  }
+  return user_policy_connector_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    BrowserProcessImpl::managed_cloud_policy_provider() {
+  DCHECK(CalledOnValidThread());
+  if (!created_managed_cloud_policy_provider_) {
+    DCHECK(!managed_cloud_policy_provider_.get());
+    created_managed_cloud_policy_provider_ = true;
+    // Combining user policy and device policy.
+    managed_cloud_policy_provider_.reset(
+        new policy::CombiningCloudPolicyProvider(
+             policy::ConfigurationPolicyPrefStore::
+                 GetChromePolicyDefinitionList()));
+    // User policy taking precedence.
+    policy::CloudPolicyProvider* user_policy =
+        user_policy_connector()->GetManagedCloudProvider();
+    if (user_policy)
+      managed_cloud_policy_provider_.get()->AddCloudPolicyProvider(user_policy);

[Joao da Silva, 2011/05/31 14:50:23]

No need for .get(), just -> from the scoped_ptr.

[sfeuz, 2011/06/03 08:30:35]

Obsolete.

+
+    policy::CloudPolicyProvider* device_policy =
+        browser_policy_connector()->GetManagedCloudProvider();
+    if (device_policy) {
+      managed_cloud_policy_provider_.get()->

[Joao da Silva, 2011/05/31 14:50:23]

Same.

[sfeuz, 2011/06/03 08:30:35]

Obsolete.

+          AddCloudPolicyProvider(device_policy);
+    }
+  }
+  return managed_cloud_policy_provider_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    BrowserProcessImpl::recommended_cloud_policy_provider() {
+  DCHECK(CalledOnValidThread());
+  if (!created_recommended_cloud_policy_provider_) {
+    DCHECK(!recommended_cloud_policy_provider_.get());
+    created_recommended_cloud_policy_provider_ = true;
+    // Combining user policy and device policy.
+    recommended_cloud_policy_provider_.reset(
+        new policy::CombiningCloudPolicyProvider(
+            policy::ConfigurationPolicyPrefStore::
+                GetChromePolicyDefinitionList()));
+    // User policy taking precedence.
+    policy::CloudPolicyProvider* user_policy =
+        user_policy_connector()->GetRecommendedCloudProvider();
+    if (user_policy)
+      recommended_cloud_policy_provider_.get()->

[Joao da Silva, 2011/05/31 14:50:23]

Same.

[sfeuz, 2011/06/03 08:30:35]

Obsolete.

+          AddCloudPolicyProvider(user_policy);
+
+    policy::CloudPolicyProvider* device_policy =
+        browser_policy_connector()->GetRecommendedCloudProvider();
+    if (device_policy) {
+      recommended_cloud_policy_provider_.get()->

[Joao da Silva, 2011/05/31 14:50:23]

Same again :-)

[sfeuz, 2011/06/03 08:30:35]

Obsolete :-)

+          AddCloudPolicyProvider(device_policy);
+    }
+  }
+  return recommended_cloud_policy_provider_.get();
+}
+
 IconManager* BrowserProcessImpl::icon_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_icon_manager_)