Unwire the clear on exit preference from the storage systems.

content/browser/browser_context.cc

Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index aafbee8410bb015e869edd6219440c065501f7b3..05f2b79d56fcd66034b3c5d203367bc509d17518 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -11,6 +11,8 @@
 #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"
@@ -112,6 +114,8 @@ void CreateQuotaManagerAndClients(BrowserContext* context) {
 void SaveSessionStateOnIOThread(ResourceContext* resource_context) {
   resource_context->GetRequestContext()->cookie_store()->GetCookieMonster()->
       SaveSessionCookies();
+  resource_context->GetRequestContext()->server_bound_cert_service()->
+      GetCertStore()->SaveSessionState();
   ResourceContext::GetAppCacheService(resource_context)->set_save_session_state(
       true);
 }
@@ -202,23 +206,6 @@ void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
   }
 }
 
-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,

[michaeln, 2012/06/01 02:06:17]

Can this method and associated stuff also be removed from the AppCacheService
class and AppCacheStorageImpl?

[jochen (gone - plz use gerrit), 2012/06/01 12:15:19]

Done.

-              base::Unretained(GetAppCacheService(browser_context)), true));
-  }
-}
-
 void BrowserContext::PurgeMemory(BrowserContext* browser_context) {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(