Move user cloud policy to BrowserProcess.

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 830ef73957acac7f3ec5bf3900e1b45f58037b90..65b93a4f7678cd5a2580bd05d14ca67fa261c037 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -7,13 +7,13 @@
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/dummy_configuration_policy_provider.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-
 #if defined(OS_WIN)
 #include "chrome/browser/policy/configuration_policy_provider_win.h"
 #elif defined(OS_MACOSX)
@@ -42,15 +42,25 @@ BrowserPolicyConnector::BrowserPolicyConnector()
   recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
 
 #if defined(OS_CHROMEOS)
+  managed_cloud_provider_.reset(new CloudPolicyProvider(
+      ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
+      CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
+  recommended_cloud_provider_.reset(new CloudPolicyProvider(
+      ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
+      CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
+
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
     identity_strategy_.reset(new DevicePolicyIdentityStrategy());
     install_attributes_.reset(new EnterpriseInstallAttributes(
         chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()));
+    DevicePolicyCache* device_policy_cache(identity_strategy_.get(),
+                                           install_attributes_.get());

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

does this even compile?

[sfeuz, 2011/05/31 07:32:31]

It does now.

+    managed_cloud_provider_->set_cache(device_policy_cache);
+    recommended_cloud_provider_->set_cache(device_policy_cache);
     cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
         identity_strategy_.get(),
-        new DevicePolicyCache(identity_strategy_.get(),
-                              install_attributes_.get())));
+        device_policy_cache));
 
     // Initialize the subsystem once the message loops are spinning.
     MessageLoop::current()->PostTask(
@@ -81,12 +91,9 @@ ConfigurationPolicyProvider*
   return managed_platform_provider_.get();
 }
 
-ConfigurationPolicyProvider*
+CloudPolicyProvider*
     BrowserPolicyConnector::GetManagedCloudProvider() const {
-  if (cloud_policy_subsystem_.get())
-    return cloud_policy_subsystem_->GetManagedPolicyProvider();
-
-  return NULL;
+  return managed_cloud_provider_.get();
 }
 
 ConfigurationPolicyProvider*
@@ -94,12 +101,9 @@ ConfigurationPolicyProvider*
   return recommended_platform_provider_.get();
 }
 
-ConfigurationPolicyProvider*
+CloudPolicyProvider*
     BrowserPolicyConnector::GetRecommendedCloudProvider() const {
-  if (cloud_policy_subsystem_.get())
-    return cloud_policy_subsystem_->GetRecommendedPolicyProvider();
-
-  return NULL;
+  return recommended_cloud_provider_.get();
 }
 
 ConfigurationPolicyProvider*