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

Unified Diff: webkit/tools/test_shell/simple_database_system.cc

Issue 2746003: Support WebSQLDatabases in incognito mode. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 months 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
« no previous file with comments | « webkit/database/vfs_backend.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/simple_database_system.cc
===================================================================
--- webkit/tools/test_shell/simple_database_system.cc (revision 49482)
+++ webkit/tools/test_shell/simple_database_system.cc (working copy)
@@ -13,8 +13,6 @@
#include "base/auto_reset.h"
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/platform_thread.h"
-#include "base/process_util.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
#include "webkit/database/database_util.h"
@@ -34,7 +32,7 @@
SimpleDatabaseSystem::SimpleDatabaseSystem()
: waiting_for_dbs_to_close_(false) {
temp_dir_.CreateUniqueTempDir();
- db_tracker_ = new DatabaseTracker(temp_dir_.path());
+ db_tracker_ = new DatabaseTracker(temp_dir_.path(), false);
db_tracker_->AddObserver(this);
DCHECK(!instance_);
instance_ = this;
@@ -51,11 +49,9 @@
FilePath file_name = GetFullFilePathForVfsFile(vfs_file_name);
if (file_name.empty()) {
VfsBackend::OpenTempFileInDirectory(
- db_tracker_->DatabaseDirectory(), desired_flags,
- base::GetCurrentProcessHandle(), &file_handle);
+ db_tracker_->DatabaseDirectory(), desired_flags, &file_handle);
} else {
- VfsBackend::OpenFile(file_name, desired_flags,
- base::GetCurrentProcessHandle(), &file_handle);
+ VfsBackend::OpenFile(file_name, desired_flags, &file_handle);
}
return file_handle;
@@ -159,7 +155,8 @@
void SimpleDatabaseSystem::ClearAllDatabases() {
// Wait for all databases to be closed.
if (!database_connections_.IsEmpty()) {
- AutoReset<bool> waiting_for_dbs_auto_reset(&waiting_for_dbs_to_close_, true);
+ AutoReset<bool> waiting_for_dbs_auto_reset(
+ &waiting_for_dbs_to_close_, true);
MessageLoop::ScopedNestableTaskAllower nestable(MessageLoop::current());
MessageLoop::current()->Run();
}
« no previous file with comments | « webkit/database/vfs_backend.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698