Introduce incognito preference settings.

chrome/browser/prefs/pref_service_mock_builder.h

 // Copyright (c) 2010 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_BROWSER_PREFS_PREF_SERVICE_MOCK_BUILDER_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_MOCK_BUILDER_H_
 #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"
 
 class CommandLine;
 class FilePath;
 class PrefService;
 class Profile;
 
 namespace policy {
 class ConfigurationPolicyProvider;
 }
 
 // A helper that allows convenient building of custom PrefServices in tests.
 class PrefServiceMockBuilder {
  public:
   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(
       policy::ConfigurationPolicyProvider* provider);
   PrefServiceMockBuilder& WithDeviceManagementProvider(
       policy::ConfigurationPolicyProvider* provider);
   PrefServiceMockBuilder& WithRecommendedProvider(
       policy::ConfigurationPolicyProvider* provider);
 
   // Specifies to use an actual command-line backed command-line pref store.
   PrefServiceMockBuilder& WithCommandLine(CommandLine* command_line);
 
   // Specifies to use an actual file-backed user pref store.
   PrefServiceMockBuilder& WithUserFilePrefs(const FilePath& prefs_file);
 
   // Sets the profile to pass to the PrefService.
   PrefServiceMockBuilder& WithRecommendedPrefs(Profile* profile);
 
   // Creates the PrefService, invalidating the entire builder configuration.
   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);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_MOCK_BUILDER_H_