Introduce incognito preference settings.

chrome/test/testing_profile.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_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/timer.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace history {
 class TopSites;
 }
 
 namespace net {
 class CookieMonster;
 }
 
 class AutocompleteClassifier;
 class BookmarkModel;
 class BrowserThemeProvider;
 class CommandLine;
 class DesktopNotificationService;
+class ExtensionPrefs;
 class ExtensionPrefStore;
-class ExtensionPrefs;
+class ExtensionPrefValueMap;
 class FaviconService;
 class FindBarState;
 class GeolocationContentSettingsMap;
 class GeolocationPermissionContext;
 class HistoryService;
 class HostContentSettingsMap;
 class PrefService;
 class ProfileSyncService;
 class SessionService;
 class TemplateURLModel;
@@ skipping 68 matching lines @@
   void SetTemplateURLModel(TemplateURLModel* model);
 
   // Uses a specific theme provider for this profile. TestingProfile takes
   // ownership of |theme_provider|.
   void UseThemeProvider(BrowserThemeProvider* theme_provider);
 
   // Creates an ExtensionService initialized with the testing profile and
   // returns it. The profile keeps its own copy of a scoped_refptr to the
   // ExtensionService to make sure that is still alive to be notified when the
   // profile is destroyed.
-  scoped_refptr<ExtensionService> CreateExtensionService(
-      const CommandLine* command_line,
-      const FilePath& install_directory);
+  ExtensionService* CreateExtensionService(const CommandLine* command_line,
+                                           const FilePath& install_directory);
 
   TestingPrefService* GetTestingPrefService();
 
   virtual ProfileId GetRuntimeId() {
     return reinterpret_cast<ProfileId>(this);
   }
 
   virtual FilePath GetPath();
 
   // Sets whether we're off the record. Default is false.
@@ skipping 182 matching lines @@
   virtual ProfileSyncService* GetProfileSyncService(
       const std::string& cros_notes);
   virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; }
   virtual ChromeBlobStorageContext* GetBlobStorageContext() { return NULL; }
   virtual ExtensionInfoMap* GetExtensionInfoMap() { return NULL; }
   virtual PromoCounter* GetInstantPromoCounter() { return NULL; }
   virtual policy::ProfilePolicyContext* GetPolicyContext() { return NULL; }
   virtual PrerenderManager* GetPrerenderManager() { return NULL; }
 
  protected:
+  virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() {
+    return extension_pref_value_map_.get();
+  }

[danno, 2011/01/14 13:05:09]

private maybe :-)

[battre, 2011/01/20 17:59:29]

decided not to change this

+
   base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
   // ref only for right type, lifecycle is managed by prefs_
   TestingPrefService* testing_prefs_;
 
  private:
   // Destroys favicon service if it has been created.
   void DestroyFaviconService();
 
   // If the webdata service has been created, it is destroyed.  This is invoked
@@ skipping 69 matching lines @@
       geolocation_content_settings_map_;
   scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
   scoped_ptr<DesktopNotificationService> desktop_notification_service_;
 
   // Find bar state.  Created lazily by GetFindBarState().
   scoped_ptr<FindBarState> find_bar_state_;
 
   FilePath last_selected_directory_;
   scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
 
-  // Extension pref store, created for use by |extension_prefs_|.
-  scoped_ptr<ExtensionPrefStore> extension_pref_store_;
-
   // The Extension Preferences. Only created if CreateExtensionService is
   // invoked.
   scoped_ptr<ExtensionPrefs> extension_prefs_;
 
   // For properly notifying the ExtensionService when the profile
   // is disposed.
   scoped_refptr<ExtensionService> extensions_service_;
 
+  scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
+
   // The proxy prefs tracker.
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   // We use a temporary directory to store testing profile data.
   ScopedTempDir temp_dir_;
 };
 
 // A profile that derives from another profile.  This does not actually
 // override anything except the GetRuntimeId() in order to test sharing of
 // site information.
 class DerivedTestingProfile : public TestingProfile {
  public:
   explicit DerivedTestingProfile(Profile* profile)
       : original_profile_(profile) {}
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();
   }
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_