Appcache, local storage, indexed db, databases: skip exit-time deletion when restarting.

webkit/database/database_tracker.cc

 // Copyright (c) 2011 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 "webkit/database/database_tracker.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 82 matching lines @@
 DatabaseTracker::DatabaseTracker(
     const FilePath& profile_path,
     bool is_incognito,
     bool clear_local_state_on_exit,
     quota::SpecialStoragePolicy* special_storage_policy,
     quota::QuotaManagerProxy* quota_manager_proxy,
     base::MessageLoopProxy* db_tracker_thread)
     : is_initialized_(false),
       is_incognito_(is_incognito),
       clear_local_state_on_exit_(clear_local_state_on_exit),
+      save_session_state_(false),
       shutting_down_(false),
       profile_path_(profile_path),
       db_dir_(is_incognito_ ?
               profile_path_.Append(kIncognitoDatabaseDirectoryName) :
               profile_path_.Append(kDatabaseDirectoryName)),
       db_(new sql::Connection()),
       databases_table_(NULL),
       meta_table_(NULL),
       special_storage_policy_(special_storage_policy),
       quota_manager_proxy_(quota_manager_proxy),
@@ skipping 737 matching lines @@
 
 void DatabaseTracker::Shutdown() {
   DCHECK(db_tracker_thread_.get());
   DCHECK(db_tracker_thread_->BelongsToCurrentThread());
   if (shutting_down_) {
     NOTREACHED();
     return;
   }
   if (is_incognito_)
     DeleteIncognitoDBDirectory();
-  else
+  else if (!save_session_state_)
     ClearLocalState(clear_local_state_on_exit_);
 }
 
 void DatabaseTracker::SetClearLocalStateOnExit(bool clear_local_state_on_exit) {
   DCHECK(db_tracker_thread_.get());
   if (!db_tracker_thread_->BelongsToCurrentThread()) {
     db_tracker_thread_->PostTask(
         FROM_HERE,
         base::Bind(&DatabaseTracker::SetClearLocalStateOnExit, this,
                    clear_local_state_on_exit));
     return;
   }
   if (shutting_down_) {
     NOTREACHED();
     return;
   }
   clear_local_state_on_exit_ = clear_local_state_on_exit;
 }
 
+void DatabaseTracker::SaveSessionState() {
+  DCHECK(db_tracker_thread_.get());
+  if (!db_tracker_thread_->BelongsToCurrentThread()) {
+    db_tracker_thread_->PostTask(
+        FROM_HERE,
+        base::Bind(&DatabaseTracker::SaveSessionState, this));
+    return;
+  }
+  save_session_state_ = true;
+}
+
 }  // namespace webkit_database