Unwire the clear on exit preference from the storage systems.

webkit/database/database_tracker.h

 // 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.
 
 #ifndef WEBKIT_DATABASE_DATABASE_TRACKER_H_
 #define WEBKIT_DATABASE_DATABASE_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 147 matching lines @@
   bool IsIncognitoProfile() const { return is_incognito_; }
 
   void GetIncognitoFileHandle(const string16& vfs_file_path,
                               base::PlatformFile* file_handle) const;
   void SaveIncognitoFileHandle(const string16& vfs_file_path,
                                const base::PlatformFile& file_handle);
   bool CloseIncognitoFileHandle(const string16& vfs_file_path);
   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>;
   friend class MockDatabaseTracker;  // for testing
 
   typedef std::map<string16, std::set<string16> > DatabaseSet;
   typedef std::vector<std::pair<net::CompletionCallback, DatabaseSet> >
       PendingDeletionCallbacks;
   typedef std::map<string16, base::PlatformFile> FileHandlesMap;
   typedef std::map<string16, string16> OriginDirectoriesMap;
@@ skipping 15 matching lines @@
       database_info_[database_name].second = description;
     }
   };
 
   // virtual for unit-testing only.
   virtual ~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);
 
   // Delete all files belonging to the given origin given that no database
   // connections within this origin are open, or if |force| is true, delete
   // the meta data and rename the associated directory.
   bool DeleteOrigin(const string16& origin_identifier, bool force);
   void DeleteDatabaseIfNeeded(const string16& origin_identifier,
                               const string16& database_name);
@@ skipping 32 matching lines @@
   // Schedule a set of open databases for deletion. If non-null, callback is
   // invoked upon completion.
   void ScheduleDatabasesForDeletion(const DatabaseSet& databases,
                                     const net::CompletionCallback& callback);
 
   // Returns the directory where all DB files for the given origin are stored.
   string16 GetOriginDirectory(const string16& origin_identifier);
 
   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_;
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<DatabasesTable> databases_table_;
   scoped_ptr<sql::MetaTable> meta_table_;
   ObserverList<Observer, true> observers_;
   std::map<string16, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;
 
@@ skipping 22 matching lines @@
   // this map to assign directory names that do not reveal this information.
   OriginDirectoriesMap incognito_origin_directories_;
   int incognito_origin_directories_generator_;
 
   FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
 };
 
 }  // namespace webkit_database
 
 #endif  // WEBKIT_DATABASE_DATABASE_TRACKER_H_