Add initial device policy infrastructure.

chrome/browser/prefs/pref_service_mock_builder.cc

Index: chrome/browser/prefs/pref_service_mock_builder.cc
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index 62f4d5464dead7617bd6374678409d5bc9077755..e71445131883785d17b7f24e5e23760e55476c09 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -25,8 +25,8 @@ PrefServiceMockBuilder::WithManagedPlatformPrefs(PrefStore* store) {
 }
 
 PrefServiceMockBuilder&
-PrefServiceMockBuilder::WithDeviceManagementPrefs(PrefStore* store) {
-  device_management_prefs_ = store;
+PrefServiceMockBuilder::WithManagedCloudPrefs(PrefStore* store) {
+  managed_cloud_prefs_ = store;
   return *this;
 }
 
@@ -49,36 +49,47 @@ PrefServiceMockBuilder::WithUserPrefs(PersistentPrefStore* store) {
 }
 
 PrefServiceMockBuilder&
-PrefServiceMockBuilder::WithRecommendedPrefs(PrefStore* store) {
-  recommended_prefs_ = store;
+PrefServiceMockBuilder::WithRecommendedPlatformPrefs(PrefStore* store) {
+  recommended_platform_prefs_ = store;
+  return *this;
+}
+
+PrefServiceMockBuilder&
+PrefServiceMockBuilder::WithRecommendedCloudPrefs(PrefStore* store) {
+  recommended_cloud_prefs_ = store;
   return *this;
 }
 
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithManagedPlatformProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  managed_platform_prefs_ =
-      new policy::ConfigurationPolicyPrefStore(provider);
+  managed_platform_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
   return *this;
 }
 
 PrefServiceMockBuilder&
-PrefServiceMockBuilder::WithDeviceManagementProvider(
+PrefServiceMockBuilder::WithManagedCloudProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  device_management_prefs_ =
-      new policy::ConfigurationPolicyPrefStore(provider);
+  managed_cloud_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
   return *this;
 }
 
 PrefServiceMockBuilder&
-PrefServiceMockBuilder::WithRecommendedProvider(
+PrefServiceMockBuilder::WithRecommendedPlatformProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  recommended_prefs_ =
+  recommended_platform_prefs_ =
       new policy::ConfigurationPolicyPrefStore(provider);
   return *this;
 }
 
 PrefServiceMockBuilder&
+PrefServiceMockBuilder::WithRecommendedCloudProvider(
+    policy::ConfigurationPolicyProvider* provider) {
+  recommended_cloud_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
+  return *this;
+}
+
+PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
   command_line_prefs_ = new CommandLinePrefStore(command_line);
   return *this;
@@ -96,18 +107,20 @@ PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
 PrefService* PrefServiceMockBuilder::Create() {
   PrefService* pref_service =
       new PrefService(managed_platform_prefs_.get(),
-                      device_management_prefs_.get(),
+                      managed_cloud_prefs_.get(),
                       extension_prefs_.get(),
                       command_line_prefs_.get(),
                       user_prefs_.get(),
-                      recommended_prefs_.get(),
+                      recommended_platform_prefs_.get(),
+                      recommended_cloud_prefs_.get(),
                       new DefaultPrefStore());
   managed_platform_prefs_ = NULL;
-  device_management_prefs_ = NULL;
+  managed_cloud_prefs_ = NULL;
   extension_prefs_ = NULL;
   command_line_prefs_ = NULL;
   user_prefs_ = NULL;
-  recommended_prefs_ = NULL;
+  recommended_platform_prefs_ = NULL;
+  recommended_cloud_prefs_ = NULL;
   user_prefs_ = new TestingPrefStore;
   return pref_service;
 }