Create additional PrefStore for Device Management policy.

chrome/test/testing_pref_service.h

Index: chrome/test/testing_pref_service.h
diff --git a/chrome/test/testing_pref_service.h b/chrome/test/testing_pref_service.h
index b0954e2d57ac1b47ec3d401faf6c253a9631667c..6a64a703712dd86c0040235d2119037a16b09103 100644
--- a/chrome/test/testing_pref_service.h
+++ b/chrome/test/testing_pref_service.h
@@ -23,6 +23,7 @@ class TestingPrefService : public PrefService {
   class TestingPrefValueStore : public PrefValueStore {
    public:
     TestingPrefValueStore(PrefStore* managed_prefs,
+                          PrefStore* device_management_prefs,
                           PrefStore* extension_prefs,
                           PrefStore* command_line_prefs,
                           PrefStore* user_prefs,
@@ -33,15 +34,18 @@ class TestingPrefService : public PrefService {
   // Create an empty instance.
   TestingPrefService();
 
-  // Create an instance that has a managed PrefStore and a command-
-  // line PrefStore. |provider| contains the provider with which to
-  // initialize the managed PrefStore. If it is NULL, then a
-  // DummyPrefStore will be created. |command_line| contains the
-  // provider with which to initialize the command line PrefStore. If
-  // it is NULL then a DummyPrefStore will be created as the command
-  // line PrefStore.
-  TestingPrefService(policy::ConfigurationPolicyProvider* provider,
-                     CommandLine* command_line);
+  // Create an instance that has a managed PrefStore and a command- line
+  // PrefStore. |managed_platform_provider| contains the provider with which to
+  // initialize the managed platform PrefStore. If it is NULL, then a
+  // DummyPrefStore will be created. |device_management_provider| contains the
+  // provider with which to initialize the device management
+  // PrefStore. |command_line| contains the provider with which to initialize
+  // the command line PrefStore. If it is NULL then a DummyPrefStore will be
+  // created as the command line PrefStore.
+  TestingPrefService(
+      policy::ConfigurationPolicyProvider* managed_platform_provider,
+      policy::ConfigurationPolicyProvider* device_management_provider,
+      CommandLine* command_line);
 
   // Read the value of a preference from the managed layer. Returns NULL if the
   // preference is not defined at the managed layer.
@@ -75,7 +79,7 @@ class TestingPrefService : public PrefService {
  private:
   // Creates a ConfigurationPolicyPrefStore based on the provided
   // |provider| or a DummyPrefStore if |provider| is NULL.
-  PrefStore* CreateManagedPrefStore(
+  PrefStore* CreatePrefStoreFromProvider(

[Mattias Nissler (ping if slow), 2010/11/12 15:02:13]

Maybe we should name this CreatePolicyPrefStoreFromProvider?

[danno, 2010/11/12 16:17:30]

Done.

       policy::ConfigurationPolicyProvider* provider);
 
   // Creates a CommandLinePrefStore based on the supplied
@@ -93,9 +97,10 @@ class TestingPrefService : public PrefService {
   void RemovePref(PrefStore* pref_store, const char* path);
 
   // Pointers to the pref stores our value store uses.
-  PrefStore* managed_prefs_;
-  PrefStore* user_prefs_;
-  PrefStore* default_prefs_;
+  PrefStore* managed_platform_prefs_;  // weak
+  PrefStore* device_management_prefs_;  // weak
+  PrefStore* user_prefs_;  // weak
+  PrefStore* default_prefs_;  // weak
 
   DISALLOW_COPY_AND_ASSIGN(TestingPrefService);
 };