Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1801)

Unified Diff: chrome/browser/in_process_webkit/indexed_db_context.h

Issue 5359005: Moved deleting the indexed db context to the WebKitContext destructor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Niptucked. Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/in_process_webkit/indexed_db_context.h
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.h b/chrome/browser/in_process_webkit/indexed_db_context.h
index 95f6536e9c15feddadefbb48a6f6550d21cd9e00..16f8a0faccabb71e9117ca2e645a439e1abefcc4 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.h
+++ b/chrome/browser/in_process_webkit/indexed_db_context.h
@@ -33,10 +33,9 @@ class IndexedDBContext {
// Get the file name of the indexed db file for the given origin.
FilePath GetIndexedDBFilePath(const string16& origin_id) const;
- // Deletes all idb files except for those on the url scheme
- // |url_scheme_to_be_skipped|.
- static void ClearLocalState(const FilePath& profile_path,
- const char* url_scheme_to_be_skipped);
+ void set_clear_local_state_on_exit(bool clear_local_state) {
+ clear_local_state_on_exit_ = clear_local_state;
+ }
// Deletes a single indexed db file.
void DeleteIndexedDBFile(const FilePath& file_path);
@@ -44,11 +43,19 @@ class IndexedDBContext {
// Deletes all indexed db files for the given origin.
void DeleteIndexedDBForOrigin(const string16& origin_id);
+#ifdef UNIT_TEST
+ // For unit tests allow to override the |data_path_|.
+ void set_data_path(const FilePath& data_path) { data_path_ = data_path; }
+#endif
+
private:
scoped_ptr<WebKit::WebIDBFactory> idb_factory_;
- // We're owned by this WebKit context.
- WebKitContext* webkit_context_;
+ // Path where the indexed db data is stored
+ FilePath data_path_;
+
+ // True if the destructor should delete its files.
+ bool clear_local_state_on_exit_;
DISALLOW_COPY_AND_ASSIGN(IndexedDBContext);
};
« no previous file with comments | « chrome/browser/in_process_webkit/indexed_db_browsertest.cc ('k') | chrome/browser/in_process_webkit/indexed_db_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698