Unwire the clear on exit preference from the storage systems.

webkit/dom_storage/dom_storage_context.h

Index: webkit/dom_storage/dom_storage_context.h
diff --git a/webkit/dom_storage/dom_storage_context.h b/webkit/dom_storage/dom_storage_context.h
index ca2b570f618d74cb9cc0f66e3717faf6fde6fb4a..1440a0c65297d54f8dc5b696ae867c31212689d9 100644
--- a/webkit/dom_storage/dom_storage_context.h
+++ b/webkit/dom_storage/dom_storage_context.h
@@ -116,11 +116,8 @@ class DomStorageContext
   // what data to keep and what data to discard at shutdown.
   // The policy is not so straight forward to describe, see
   // the implementation for details.
-  void SetClearLocalState(bool clear_local_state) {
-    clear_local_state_ = clear_local_state;
-  }
-  void SaveSessionState() {
-    save_session_state_ = true;
+  void SetForceKeepSessionState() {
+    force_keep_session_state_ = true;
   }
 
   // Called when the owning BrowserContext is ending.
@@ -167,7 +164,7 @@ class DomStorageContext
 
   ~DomStorageContext();
 
-  void ClearLocalStateInCommitSequence();
+  void ClearSessionOnlyOrigins();
 
   // Collection of namespaces keyed by id.
   StorageNamespaceMap namespaces_;
@@ -191,8 +188,7 @@ class DomStorageContext
   base::AtomicSequenceNumber session_id_sequence_;
 
   bool is_shutdown_;
-  bool clear_local_state_;
-  bool save_session_state_;
+  bool force_keep_session_state_;
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
 };