Unwire the clear on exit preference from the storage systems.

webkit/database/database_tracker.h

Index: webkit/database/database_tracker.h
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h
index 709e66215cd7c63293af51110f9608dae1078fd6..1c775eb269c3780254afbf5c5c76a8f36b0aab08 100644
--- a/webkit/database/database_tracker.h
+++ b/webkit/database/database_tracker.h
@@ -165,11 +165,10 @@ class DatabaseTracker
   bool HasSavedIncognitoFileHandle(const string16& vfs_file_path) const;
 
   // Shutdown the database tracker, deleting database files if the tracker is
-  // used for an incognito profile or |clear_local_state_on_exit_| is true.
+  // used for an incognito profile.
   void Shutdown();
-  void SetClearLocalStateOnExit(bool clear_local_state_on_exit);
-  // Disables the exit-time deletion for all data (also session-only data).
-  void SaveSessionState();
+  // Disables the exit-time deletion of session-only data.
+  void SetForceKeepSessionState();
 
  private:
   friend class base::RefCountedThreadSafe<DatabaseTracker>;
@@ -205,10 +204,8 @@ class DatabaseTracker
   // Deletes the directory that stores all DBs in incognito mode, if it exists.
   void DeleteIncognitoDBDirectory();
 
-  // If clear_all_databases is true, deletes all databases not protected by
-  // special storage policy. Otherwise deletes session-only databases. Blocks
-  // databases from being created/opened.
-  void ClearLocalState(bool clear_all_databases);
+  // Deletes session-only databases. Blocks databases from being created/opened.
+  void ClearSessionOnlyOrigins();
 
   bool DeleteClosedDatabase(const string16& origin_identifier,
                             const string16& database_name);
@@ -261,8 +258,7 @@ class DatabaseTracker
 
   bool is_initialized_;
   const bool is_incognito_;
-  bool clear_local_state_on_exit_;
-  bool save_session_state_;
+  bool force_keep_session_state_;
   bool shutting_down_;
   const FilePath profile_path_;
   const FilePath db_dir_;