Unwire the clear on exit preference from the storage systems.

webkit/dom_storage/dom_storage_context.cc

Index: webkit/dom_storage/dom_storage_context.cc
diff --git a/webkit/dom_storage/dom_storage_context.cc b/webkit/dom_storage/dom_storage_context.cc
index e31019067cea7b9922f5e894dd30e741c1d0b5c9..461c84ea33a6632bb6b4a21fa3108a7681ce8b65 100644
--- a/webkit/dom_storage/dom_storage_context.cc
+++ b/webkit/dom_storage/dom_storage_context.cc
@@ -31,7 +31,6 @@ DomStorageContext::DomStorageContext(
       sessionstorage_directory_(sessionstorage_directory),
       task_runner_(task_runner),
       is_shutdown_(false),
-      clear_local_state_(false),
       save_session_state_(false),
       special_storage_policy_(special_storage_policy) {
   // AtomicSequenceNum starts at 0 but we want to start session
@@ -136,7 +135,7 @@ void DomStorageContext::Shutdown() {
       special_storage_policy_.get() &&
       special_storage_policy_->HasSessionOnlyOrigins();
 
-  if (clear_local_state_ || has_session_only_origins) {
+  if (has_session_only_origins) {
     // We may have to delete something. We continue on the
     // commit sequence after area shutdown tasks have cycled
     // thru that sequence (and closed their database files).
@@ -223,8 +222,7 @@ void DomStorageContext::ClearLocalStateInCommitSequence() {
     if (special_storage_policy_ &&
         special_storage_policy_->IsStorageProtected(origin))
       continue;
-    if (!clear_local_state_ &&
-        !special_storage_policy_->IsStorageSessionOnly(origin))
+    if (!special_storage_policy_->IsStorageSessionOnly(origin))
       continue;
 
     const bool kNotRecursive = false;