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

Unified Diff: webkit/browser/fileapi/obfuscated_file_util.cc

Issue 145693005: [FileAPI] Replace default leveldb::Env with leveldb::MemEnv in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 11 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
Index: webkit/browser/fileapi/obfuscated_file_util.cc
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index 5cae814f7cb181f4a348cf99fa1f6107e1498485..952645a2a42fabe099366c32b04c8734324834f9 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -254,12 +254,14 @@ class ObfuscatedOriginEnumerator
ObfuscatedFileUtil::ObfuscatedFileUtil(
quota::SpecialStoragePolicy* special_storage_policy,
const base::FilePath& file_system_directory,
+ leveldb::Env* env_override,
base::SequencedTaskRunner* file_task_runner,
const GetTypeStringForURLCallback& get_type_string_for_url,
const std::set<std::string>& known_type_strings,
SandboxFileSystemBackendDelegate* sandbox_delegate)
: special_storage_policy_(special_storage_policy),
file_system_directory_(file_system_directory),
+ env_override_(env_override),
db_flush_delay_seconds_(10 * 60), // 10 mins.
file_task_runner_(file_task_runner),
get_type_string_for_url_(get_type_string_for_url),
@@ -944,7 +946,7 @@ bool ObfuscatedFileUtil::DestroyDirectoryDatabase(
origin, type_string, false, &error);
if (path.empty() || error == base::File::FILE_ERROR_NOT_FOUND)
return true;
- return SandboxDirectoryDatabase::DestroyDatabase(path);
+ return SandboxDirectoryDatabase::DestroyDatabase(path, env_override_);
}
// static
@@ -954,7 +956,8 @@ int64 ObfuscatedFileUtil::ComputeFilePathCost(const base::FilePath& path) {
void ObfuscatedFileUtil::MaybePrepopulateDatabase(
const std::vector<std::string>& type_strings_to_prepopulate) {
- SandboxPrioritizedOriginDatabase database(file_system_directory_);
+ SandboxPrioritizedOriginDatabase database(file_system_directory_,
+ env_override_);
std::string origin_string = database.GetPrimaryOrigin();
if (origin_string.empty() || !database.HasOriginPath(origin_string))
return;
@@ -972,7 +975,8 @@ void ObfuscatedFileUtil::MaybePrepopulateDatabase(
origin, type_string, false, &error);
if (error != base::File::FILE_OK)
continue;
- scoped_ptr<SandboxDirectoryDatabase> db(new SandboxDirectoryDatabase(path));
+ scoped_ptr<SandboxDirectoryDatabase> db(
+ new SandboxDirectoryDatabase(path, env_override_));
if (db->Init(SandboxDirectoryDatabase::FAIL_ON_CORRUPTION)) {
directories_[GetDirectoryDatabaseKey(origin, type_string)] = db.release();
MarkUsed();
@@ -1173,7 +1177,8 @@ SandboxDirectoryDatabase* ObfuscatedFileUtil::GetDirectoryDatabase(
return NULL;
}
MarkUsed();
- SandboxDirectoryDatabase* database = new SandboxDirectoryDatabase(path);
+ SandboxDirectoryDatabase* database =
+ new SandboxDirectoryDatabase(path, env_override_);
directories_[key] = database;
return database;
}
@@ -1274,7 +1279,8 @@ bool ObfuscatedFileUtil::InitOriginDatabase(const GURL& origin_hint,
}
SandboxPrioritizedOriginDatabase* prioritized_origin_database =
- new SandboxPrioritizedOriginDatabase(file_system_directory_);
+ new SandboxPrioritizedOriginDatabase(file_system_directory_,
+ env_override_);
origin_database_.reset(prioritized_origin_database);
if (origin_hint.is_empty() || !HasIsolatedStorage(origin_hint))
« no previous file with comments | « webkit/browser/fileapi/obfuscated_file_util.h ('k') | webkit/browser/fileapi/plugin_private_file_system_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698