Move user cloud policy to BrowserProcess.

chrome/browser/policy/browser_policy_connector.cc

 // 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/browser_policy_connector.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/cloud_policy_provider.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)

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

Why you no like blank line? :-)

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

Done.

 #include "chrome/browser/policy/configuration_policy_provider_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/policy/configuration_policy_provider_mac.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/policy/config_dir_policy_provider.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/policy/device_policy_cache.h"
 #include "chrome/browser/policy/device_policy_identity_strategy.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 #endif
 
 namespace policy {
 
 // static
 BrowserPolicyConnector* BrowserPolicyConnector::Create() {
   return new BrowserPolicyConnector();
 }
 
 BrowserPolicyConnector::BrowserPolicyConnector()
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   managed_platform_provider_.reset(CreateManagedPlatformProvider());
   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 =
+        new DevicePolicyCache(identity_strategy_.get(),
+                              install_attributes_.get());
+    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(
         FROM_HERE,
         method_factory_.NewRunnableMethod(&BrowserPolicyConnector::Initialize));
   }
 #endif
 }
 
 BrowserPolicyConnector::BrowserPolicyConnector(
@@ skipping 10 matching lines @@
 #if defined(OS_CHROMEOS)
   identity_strategy_.reset();
 #endif
 }
 
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetManagedPlatformProvider() const {
   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*
     BrowserPolicyConnector::GetRecommendedPlatformProvider() const {
   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*
     BrowserPolicyConnector::CreateManagedPlatformProvider() {
   const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list =
       ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList();
 #if defined(OS_WIN)
   return new ConfigurationPolicyProviderWin(policy_list);
 #elif defined(OS_MACOSX)
   return new ConfigurationPolicyProviderMac(policy_list);
@@ skipping 76 matching lines @@
 #endif
 }
 
 void BrowserPolicyConnector::Initialize() {
   // TODO(jkummerow, mnissler): Move this out of the browser startup path.
   if (cloud_policy_subsystem_.get())
     cloud_policy_subsystem_->Initialize(g_browser_process->local_state());
 }
 
 }  // namespace