Split incognito extension content settings in session-only and persistent.

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 f35020c44f9df9a21ce074e4b660070ca17d32db..361ee4cf807f6085eab3616af1b7695a708d8340 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -244,6 +244,12 @@ class OffTheRecordProfileImpl : public Profile,
 
     if (pref_proxy_config_tracker_)
       pref_proxy_config_tracker_->DetachFromPrefService();
+
+    ExtensionService* extension_service = GetExtensionService();
+    if (extension_service) {
+      ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
+      extension_prefs->ClearIncognitoSessionOnlyContentSettings();
+    }
   }
 
   virtual ProfileId GetRuntimeId() {
@@ -742,7 +748,7 @@ class OffTheRecordProfileImpl : public Profile,
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
-  // We use a non-writable content settings map for OTR.
+  // We use a non-persistent content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   // Use a separate zoom map for OTR.