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

chrome/browser/profiles/profile.cc

 // 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.
 
 #include "chrome/browser/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 226 matching lines @@
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(
               db_tracker_.get(),
               &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory));
 
     BrowserList::RemoveObserver(this);
 
     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() {
     return reinterpret_cast<ProfileId>(this);
   }
 
   virtual std::string GetProfileName() {
     // Incognito profile should not return the profile name.
     return std::string();
   }
@@ skipping 478 matching lines @@
   // Weak pointer owned by |profile_|.
   PrefService* prefs_;
 
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   OffTheRecordProfileIOData::Handle io_data_;
 
   // 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.
   scoped_refptr<HostZoomMap> host_zoom_map_;
 
   // Use a special WebKit context for OTR browsing.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
   // profile because then the main profile would learn some of the host names
@@ skipping 60 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }