Unwire the clear on exit preference from the storage systems.

content/browser/browser_context.cc

 // Copyright (c) 2012 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 "content/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_constants.h"
+#include "net/base/server_bound_cert_service.h"
+#include "net/base/server_bound_cert_store.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
@@ skipping 80 matching lines @@
                    appcache_service,
                    context->IsOffTheRecord() ? FilePath() :
                        context->GetPath().Append(content::kAppCacheDirname),
                    context->GetResourceContext(),
                    make_scoped_refptr(context->GetSpecialStoragePolicy())));
   }
 }
 
 void SaveSessionStateOnIOThread(ResourceContext* resource_context) {
   resource_context->GetRequestContext()->cookie_store()->GetCookieMonster()->
-      SaveSessionCookies();
-  ResourceContext::GetAppCacheService(resource_context)->set_save_session_state(
-      true);
+      SetForceKeepSessionState();
+  resource_context->GetRequestContext()->server_bound_cert_service()->
+      GetCertStore()->SetForceKeepSessionState();
+  ResourceContext::GetAppCacheService(resource_context)->
+      set_force_keep_session_state();
 }
 
 void SaveSessionStateOnWebkitThread(
     scoped_refptr<IndexedDBContextImpl> indexed_db_context) {
-  indexed_db_context->SaveSessionState();
+  indexed_db_context->SetForceKeepSessionState();
 }
 
 void PurgeMemoryOnIOThread(ResourceContext* resource_context) {
   ResourceContext::GetAppCacheService(resource_context)->PurgeMemory();
 }
 
 DOMStorageContextImpl* GetDOMStorageContextImpl(BrowserContext* context) {
   return static_cast<DOMStorageContextImpl*>(
       BrowserContext::GetDOMStorageContext(context));
 }
@@ skipping 42 matching lines @@
   // This will be enough to tickle initialization of BrowserContext if
   // necessary, which initializes ResourceContext. The reason we don't call
   // ResourceContext::InitializeResourceContext directly here is that if
   // ResourceContext ends up initializing it will call back into BrowserContext
   // and when that call return it'll end rewriting its UserData map (with the
   // same value) but this causes a race condition. See http://crbug.com/115678.
   CreateQuotaManagerAndClients(context);
 }
 
 void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
-  GetDatabaseTracker(browser_context)->SaveSessionState();
+  GetDatabaseTracker(browser_context)->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SaveSessionStateOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
-  GetDOMStorageContextImpl(browser_context)->SaveSessionState();
+  GetDOMStorageContextImpl(browser_context)->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
         GetIndexedDBContext(browser_context));
     BrowserThread::PostTask(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
         base::Bind(&SaveSessionStateOnWebkitThread,
                    make_scoped_refptr(indexed_db)));
   }
 }
 
-void BrowserContext::ClearLocalOnDestruction(BrowserContext* browser_context) {
-  GetDOMStorageContextImpl(browser_context)->SetClearLocalState(true);
-
-  IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
-      GetIndexedDBContext(browser_context));
-  indexed_db->set_clear_local_state_on_exit(true);
-
-  GetDatabaseTracker(browser_context)->SetClearLocalStateOnExit(true);
-
-  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
-    BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          base::Bind(&appcache::AppCacheService::set_clear_local_state_on_exit,
-              base::Unretained(GetAppCacheService(browser_context)), true));
-  }
-}
-
 void BrowserContext::PurgeMemory(BrowserContext* browser_context) {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&PurgeMemoryOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
   GetDOMStorageContextImpl(browser_context)->PurgeMemory();
 }
 
 BrowserContext::~BrowserContext() {
   // These message loop checks are just to avoid leaks in unittests.
   if (GetUserData(kDatabaseTrackerKeyName) &&
       BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&webkit_database::DatabaseTracker::Shutdown,
                    GetDatabaseTracker(this)));
   }
 
   if (GetUserData(kDOMStorageContextKeyName))
     GetDOMStorageContextImpl(this)->Shutdown();
 }
 
 }  // namespace content