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

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 43b1995fcc023ce90cdc0aa19564d22768bb98c3..e60fa45dfd6c972de435f64ebbdeba29c07b13b0 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -11,7 +11,6 @@
 #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_provider_impl.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_service_impl.h"
@@ -38,6 +37,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/login/signed_settings_helper.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/policy/app_pack_updater.h"
 #include "chrome/browser/policy/device_policy_cache.h"
@@ -111,27 +111,42 @@ void BrowserPolicyConnector::Init() {
   managed_platform_provider_.reset(CreateManagedPlatformProvider());
   recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
 
-  managed_cloud_provider_.reset(new CloudPolicyProviderImpl(
-      this,
-      GetChromePolicyDefinitionList(),
-      POLICY_LEVEL_MANDATORY));
-  recommended_cloud_provider_.reset(new CloudPolicyProviderImpl(
-      this,
-      GetChromePolicyDefinitionList(),
-      POLICY_LEVEL_RECOMMENDED));
+#if defined(OS_CHROMEOS)
+  // The CloudPolicyProvider blocks asynchronous Profile creation until a login
+  // is performed. This is used to ensure that the Profile's PrefService sees
+  // managed preferences on managed Chrome OS devices. However, this also
+  // prevents creation of new Profiles in Desktop Chrome. The implementation of
+  // cloud policy on the Desktop requires a refactoring of the cloud provider,
+  // but for now it just isn't created.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
+    managed_cloud_provider_.reset(new CloudPolicyProvider(
+        this,
+        GetChromePolicyDefinitionList(),
+        POLICY_LEVEL_MANDATORY));
+    recommended_cloud_provider_.reset(new CloudPolicyProvider(
+        this,
+        GetChromePolicyDefinitionList(),
+        POLICY_LEVEL_RECOMMENDED));
+  }
+#endif
 
   // |providers| in decreasing order of priority.
   PolicyServiceImpl::Providers providers;
-  providers.push_back(managed_platform_provider_.get());
-  providers.push_back(managed_cloud_provider_.get());
-  providers.push_back(recommended_platform_provider_.get());
-  providers.push_back(recommended_cloud_provider_.get());
+  if (managed_platform_provider_.get())
+    providers.push_back(managed_platform_provider_.get());
+  if (managed_cloud_provider_.get())
+    providers.push_back(managed_cloud_provider_.get());
+  if (recommended_platform_provider_.get())
+    providers.push_back(recommended_platform_provider_.get());
+  if (recommended_cloud_provider_.get())
+    providers.push_back(recommended_cloud_provider_.get());
   policy_service_.reset(new PolicyServiceImpl(providers));
 
 #if defined(OS_CHROMEOS)
   InitializeDevicePolicy();
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableONCPolicy)) {
+  if (command_line->HasSwitch(switches::kEnableONCPolicy)) {
     network_configuration_updater_.reset(
         new NetworkConfigurationUpdater(
             managed_cloud_provider_.get(),
@@ -318,10 +333,8 @@ void BrowserPolicyConnector::InitializeUserPolicy(
         new UserPolicyTokenCache(user_data_store_.get(),
                                  policy_cache_dir.Append(kTokenCacheFile)));
 
-    // Prepending user caches meaning they will take precedence of device policy
-    // caches.
-    managed_cloud_provider_->PrependCache(user_policy_cache);
-    recommended_cloud_provider_->PrependCache(user_policy_cache);
+    managed_cloud_provider_->SetUserPolicyCache(user_policy_cache);
+    recommended_cloud_provider_->SetUserPolicyCache(user_policy_cache);
     user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
         user_data_store_.get(),
         user_policy_cache));
@@ -453,10 +466,11 @@ void BrowserPolicyConnector::InitializeDevicePolicy() {
     install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
     DevicePolicyCache* device_policy_cache =
         new DevicePolicyCache(device_data_store_.get(),
-                              install_attributes_.get());
+                              install_attributes_.get(),
+                              chromeos::SignedSettingsHelper::Get());
 
-    managed_cloud_provider_->AppendCache(device_policy_cache);
-    recommended_cloud_provider_->AppendCache(device_policy_cache);
+    managed_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
+    recommended_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
 
     device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
         device_data_store_.get(),