Allow device policy code to be optionally included.

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 66e3e99c79e36666788bcfb48ace5d31b8b9ce21..edffa8011d0938545fb742f54615b22bed91a928 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -63,14 +63,15 @@ PrefServiceMockBuilder::WithRecommendedCloudPrefs(PrefStore* store) {
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithManagedPlatformProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  managed_platform_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
+  managed_platform_prefs_ = policy::ConfigurationPolicyPrefStore::Create(
+      provider);
   return *this;
 }
 
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithManagedCloudProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  managed_cloud_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
+  managed_cloud_prefs_ = policy::ConfigurationPolicyPrefStore::Create(provider);
   return *this;
 }
 
@@ -78,14 +79,15 @@ PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithRecommendedPlatformProvider(
     policy::ConfigurationPolicyProvider* provider) {
   recommended_platform_prefs_ =
-      new policy::ConfigurationPolicyPrefStore(provider);
+      policy::ConfigurationPolicyPrefStore::Create(provider);
   return *this;
 }
 
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithRecommendedCloudProvider(
     policy::ConfigurationPolicyProvider* provider) {
-  recommended_cloud_prefs_ = new policy::ConfigurationPolicyPrefStore(provider);
+  recommended_cloud_prefs_ = policy::ConfigurationPolicyPrefStore::Create(
+      provider);
   return *this;
 }