Unwire the clear on exit preference from the storage systems.

content/browser/dom_storage/dom_storage_context_impl.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/browser/dom_storage/dom_storage_context_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop_proxy.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 132 matching lines @@
 }
 
 void DOMStorageContextImpl::PurgeMemory() {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::PurgeMemory, context_));
 }
 
-void DOMStorageContextImpl::SetClearLocalState(bool clear_local_state) {
+void DOMStorageContextImpl::SetForceKeepSessionState() {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
-      base::Bind(&DomStorageContext::SetClearLocalState, context_,
-                 clear_local_state));
-}
-
-void DOMStorageContextImpl::SaveSessionState() {
-  DCHECK(context_);
-  context_->task_runner()->PostShutdownBlockingTask(
-      FROM_HERE,
-      DomStorageTaskRunner::PRIMARY_SEQUENCE,
-      base::Bind(&DomStorageContext::SaveSessionState, context_));
+      base::Bind(&DomStorageContext::SetForceKeepSessionState, context_));
 }
 
 void DOMStorageContextImpl::Shutdown() {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::Shutdown, context_));
 }
 
 int64 DOMStorageContextImpl::LeakyCloneSessionStorage(
     int64 existing_namespace_id) {
   DCHECK(context_);
   int64 clone_id = context_->AllocateSessionId();
   context_->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CloneSessionNamespace, context_,
                  existing_namespace_id, clone_id));
   return clone_id;
 }