Move user cloud policy to BrowserProcess.

chrome/test/testing_browser_process.cc

Index: chrome/test/testing_browser_process.cc
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
index f6d265e7c08ccb6e758afec2bf0e6a05f515b1b5..033b515a1928ad4db54390f102ffcf0b9a441e54 100644
--- a/chrome/test/testing_browser_process.cc
+++ b/chrome/test/testing_browser_process.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/user_policy_connector.h"

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

Nit: alphabetic order.

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

Obsolete.

 #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"
@@ -103,6 +104,38 @@ policy::BrowserPolicyConnector*
   return browser_policy_connector_.get();
 }
 
+policy::UserPolicyConnector*
+    TestingBrowserProcess::user_policy_connector() {
+  if (!user_policy_connector_.get()) {
+    user_policy_connector_.reset(policy::UserPolicyConnector::Create());
+  }
+  return user_policy_connector_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    TestingBrowserProcess::managed_cloud_policy_provider() {
+  if (!managed_cloud_policy_provider_.get()) {
+    const policy::ConfigurationPolicyProvider::PolicyDefinitionList*
+        policy_list = policy::ConfigurationPolicyPrefStore::
+        GetChromePolicyDefinitionList();

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

Nit: indent.

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

Obsolete.

+    managed_cloud_policy_provider_.reset(
+        new policy::DummyConfigurationPolicyProvider(policy_list));
+  }
+  return managed_cloud_policy_provider_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    TestingBrowserProcess::recommended_cloud_policy_provider() {
+  if (!recommended_cloud_policy_provider_.get()) {
+    const policy::ConfigurationPolicyProvider::PolicyDefinitionList*
+        policy_list = policy::ConfigurationPolicyPrefStore::
+        GetChromePolicyDefinitionList();

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

Nit: indent.

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

Obsolete.

+    recommended_cloud_policy_provider_.reset(
+        new policy::DummyConfigurationPolicyProvider(policy_list));
+  }
+  return recommended_cloud_policy_provider_.get();
+}
+
 IconManager* TestingBrowserProcess::icon_manager() {
   return NULL;
 }