Introduce incognito preference settings.

chrome/test/testing_pref_service.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_TEST_TESTING_PREF_SERVICE_H_
 #define CHROME_TEST_TESTING_PREF_SERVICE_H_
 #pragma once
 
+#include "base/ref_counted.h"
 #include "chrome/browser/prefs/pref_service.h"
 
+class ExtensionPrefStore;
 class TestingPrefStore;
 
 // A PrefService subclass for testing. It operates totally in memory and
 // provides additional API for manipulating preferences at the different levels
 // (managed, extension, user) conveniently.
-class TestingPrefService : public PrefService {
+class TestingPrefServiceBase : public PrefService {
  public:
-  // Create an empty instance.
-  TestingPrefService();
-  virtual ~TestingPrefService() {}
+  virtual ~TestingPrefServiceBase();
 
   // Read the value of a preference from the managed layer. Returns NULL if the
   // preference is not defined at the managed layer.
   const Value* GetManagedPref(const char* path) const;
 
   // Set a preference on the managed layer and fire observers if the preference
   // changed. Assumes ownership of |value|.
   void SetManagedPref(const char* path, Value* value);
 
   // Clear the preference on the managed layer and fire observers if the
   // preference has been defined previously.
   void RemoveManagedPref(const char* path);
 
   // Similar to the above, but for user preferences.
   const Value* GetUserPref(const char* path) const;
   void SetUserPref(const char* path, Value* value);
   void RemoveUserPref(const char* path);
 
+  ExtensionPrefStore* GetExtensionPrefs();

[Mattias Nissler (ping if slow), 2011/01/05 12:08:07]

This is bad, we should have TestingPrefStores exclusively. The rationale is that
TestingPrefService is designed s.t. tests can setup up values in the stores at
their own discretion easily.

[battre, 2011/01/05 20:23:08]

Gone. TestingPrefService cannot use ExtensionPrefStores, however.

+
+ protected:
+  TestingPrefServiceBase(
+      TestingPrefStore* managed_platform_prefs,
+      TestingPrefStore* device_management_prefs,
+      ExtensionPrefStore* extension_prefs,
+      TestingPrefStore* user_prefs);
+
+  // Pointers to the pref stores our value store uses.
+  scoped_refptr<TestingPrefStore> managed_platform_prefs_;
+  scoped_refptr<TestingPrefStore> device_management_prefs_;
+  scoped_refptr<ExtensionPrefStore> extension_prefs_;
+  scoped_refptr<TestingPrefStore> user_prefs_;
+
  private:
   // Reads the value of the preference indicated by |path| from |pref_store|.
   // Returns NULL if the preference was not found.
   const Value* GetPref(TestingPrefStore* pref_store, const char* path) const;
 
   // Sets the value for |path| in |pref_store|.
   void SetPref(TestingPrefStore* pref_store, const char* path, Value* value);
 
   // Removes the preference identified by |path| from |pref_store|.
   void RemovePref(TestingPrefStore* pref_store, const char* path);
 
-  // Pointers to the pref stores our value store uses.
-  TestingPrefStore* managed_platform_prefs_;  // weak
-  TestingPrefStore* device_management_prefs_;  // weak
-  TestingPrefStore* user_prefs_;  // weak
+  DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceBase);
+};
 
+// Class for simplified construction of TestPrefServiceBase objects.
+class TestingPrefService : public TestingPrefServiceBase {
+ public:
+  TestingPrefService();
+  virtual ~TestingPrefService();
+ private:

[Mattias Nissler (ping if slow), 2011/01/05 12:08:07]

new line before private:

[battre, 2011/01/05 20:23:08]

Done.

   DISALLOW_COPY_AND_ASSIGN(TestingPrefService);
 };
 
 #endif  // CHROME_TEST_TESTING_PREF_SERVICE_H_