Introduce incognito preference settings.

chrome/browser/profiles/profile.cc

Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 3b13b59562e1198c40c2268dd4812f75ecc2fd85..7654eb1543b404428236b3bb6b96d879f57edc61 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -20,10 +20,12 @@
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
+#include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -139,6 +141,9 @@ class OffTheRecordProfileImpl : public Profile,
   explicit OffTheRecordProfileImpl(Profile* real_profile)
       : profile_(real_profile),
         start_time_(Time::Now()) {
+    prefs_.reset(profile_->GetPrefs()->CreateIncognitoPrefService(
+        new ExtensionPrefStore(profile_->GetExtensionPrefValueMap(), true)));

[Mattias Nissler (ping if slow), 2011/01/21 08:53:08]

Hm, what's the contract of GetExtensionPrefValueMap()? As far as I can see it
may return NULL if you don't call real_profile->GetPrefs() first, but you're not
prepared to handle that here. Maybe you want to move the lazy initialization
into GetExtensionPrefValueMap so it always returns something?

[battre, 2011/01/24 17:47:18]

I cannot move the entire lazy initialization of |extension_pref_value_map_| into
GetExtensionPrefValueMap because |pref_| requires it at construction time. I
call GetPrefs() now in ProfileImpl::GetExtensionPrefValueMap(). That does the
trick.

Done.

+
     request_context_ = ChromeURLRequestContextGetter::CreateOffTheRecord(this);
     extension_process_manager_.reset(ExtensionProcessManager::Create(this));
 
@@ -163,6 +168,9 @@ class OffTheRecordProfileImpl : public Profile,
             &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory));
 
     BrowserList::RemoveObserver(this);
+
+    if (pref_proxy_config_tracker_)
+      pref_proxy_config_tracker_->DetachFromPrefService();
   }
 
   virtual ProfileId GetRuntimeId() {
@@ -314,7 +322,7 @@ class OffTheRecordProfileImpl : public Profile,
   }
 
   virtual PrefService* GetPrefs() {
-    return profile_->GetPrefs();
+    return prefs_.get();
   }
 
   virtual TemplateURLModel* GetTemplateURLModel() {
@@ -612,7 +620,10 @@ class OffTheRecordProfileImpl : public Profile,
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
-    return profile_->GetProxyConfigTracker();
+    if (!pref_proxy_config_tracker_)
+      pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
+
+    return pref_proxy_config_tracker_;
   }
 
   virtual PrerenderManager* GetPrerenderManager() {
@@ -622,12 +633,19 @@ class OffTheRecordProfileImpl : public Profile,
     return NULL;
   }
 
+ protected:
+  virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() {
+    return profile_->GetExtensionPrefValueMap();
+  }
+
  private:
   NotificationRegistrar registrar_;
 
   // The real underlying profile.
   Profile* profile_;
 
+  scoped_ptr<PrefService> prefs_;
+
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   // The context to use for requests made from this OTR session.
@@ -683,6 +701,8 @@ class OffTheRecordProfileImpl : public Profile,
   // The file_system context for this profile.
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
 
+  scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };