Introduce incognito preference settings.

chrome/browser/prefs/pref_service_mock_builder.h

Index: chrome/browser/prefs/pref_service_mock_builder.h
diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h
index c17040e3ceba7b54d011569f27774bfc417598c7..8100615f1a65bba3c57397d5dfec3adade13af82 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.h
+++ b/chrome/browser/prefs/pref_service_mock_builder.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/ref_counted.h"
 #include "chrome/common/persistent_pref_store.h"
 #include "chrome/common/pref_store.h"
 
@@ -27,12 +27,15 @@ class PrefServiceMockBuilder {
 
   // Functions for setting the various parameters of the PrefService to build.
   // These take ownership of the |store| parameter.
-  PrefServiceMockBuilder& WithManagedPlatformPrefs(PrefStore* store);
-  PrefServiceMockBuilder& WithDeviceManagementPrefs(PrefStore* store);
-  PrefServiceMockBuilder& WithExtensionPrefs(PrefStore* store);
-  PrefServiceMockBuilder& WithCommandLinePrefs(PrefStore* store);
-  PrefServiceMockBuilder& WithUserPrefs(PersistentPrefStore* store);
-  PrefServiceMockBuilder& WithRecommendedPrefs(PrefStore* store);
+  PrefServiceMockBuilder& WithManagedPlatformPrefs(
+      scoped_refptr<PrefStore> store);

[Mattias Nissler (ping if slow), 2010/12/20 14:50:02]

Plain pointer parameters here.

[battre, 2010/12/21 18:51:59]

Done.

+  PrefServiceMockBuilder& WithDeviceManagementPrefs(
+      scoped_refptr<PrefStore> store);
+  PrefServiceMockBuilder& WithExtensionPrefs(scoped_refptr<PrefStore> store);
+  PrefServiceMockBuilder& WithCommandLinePrefs(scoped_refptr<PrefStore> store);
+  PrefServiceMockBuilder& WithUserPrefs(
+      scoped_refptr<PersistentPrefStore> store);
+  PrefServiceMockBuilder& WithRecommendedPrefs(scoped_refptr<PrefStore> store);
 
   // Set up policy pref stores using the given policy provider.
   PrefServiceMockBuilder& WithManagedPlatformProvider(
@@ -55,12 +58,12 @@ class PrefServiceMockBuilder {
   PrefService* Create();
 
  private:
-  scoped_ptr<PrefStore> managed_platform_prefs_;
-  scoped_ptr<PrefStore> device_management_prefs_;
-  scoped_ptr<PrefStore> extension_prefs_;
-  scoped_ptr<PrefStore> command_line_prefs_;
-  scoped_ptr<PersistentPrefStore> user_prefs_;
-  scoped_ptr<PrefStore> recommended_prefs_;
+  scoped_refptr<PrefStore> managed_platform_prefs_;
+  scoped_refptr<PrefStore> device_management_prefs_;
+  scoped_refptr<PrefStore> extension_prefs_;
+  scoped_refptr<PrefStore> command_line_prefs_;
+  scoped_refptr<PersistentPrefStore> user_prefs_;
+  scoped_refptr<PrefStore> recommended_prefs_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceMockBuilder);