Allow device policy code to be optionally included.

chrome/browser/prefs/pref_service_mock_builder.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/prefs/pref_service_mock_builder.h"
 
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/default_pref_store.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 45 matching lines @@
 
 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_ = 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;
 }
 
 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;
 }
 
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
   command_line_prefs_ = new CommandLinePrefStore(command_line);
   return *this;
 }
 
 PrefServiceMockBuilder&
@@ skipping 19 matching lines @@
   managed_platform_prefs_ = NULL;
   managed_cloud_prefs_ = NULL;
   extension_prefs_ = NULL;
   command_line_prefs_ = NULL;
   user_prefs_ = NULL;
   recommended_platform_prefs_ = NULL;
   recommended_cloud_prefs_ = NULL;
   user_prefs_ = new TestingPrefStore;
   return pref_service;
 }