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

Unified Diff: webkit/fileapi/sandbox_mount_point_provider.cc

Issue 10407115: Always pass FileSystemContext to ObfuscatedFileUtil operations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 8 years, 7 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/fileapi/sandbox_mount_point_provider.cc
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index 74dc0ca6e1b9bbbdf59a435e0c6e9360df407d63..1c5fa78b32e540e3930dd3f766594479caa7e317 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -498,11 +498,14 @@ FilePath SandboxMountPointProvider::GetBaseDirectoryForOriginAndType(
}
bool SandboxMountPointProvider::DeleteOriginDataOnFileThread(
- QuotaManagerProxy* proxy, const GURL& origin_url,
+ FileSystemContext* file_system_context,
+ QuotaManagerProxy* proxy,
+ const GURL& origin_url,
fileapi::FileSystemType type) {
MigrateIfNeeded(sandbox_file_util_, old_base_path());
- int64 usage = GetOriginUsageOnFileThread(origin_url, type);
+ int64 usage = GetOriginUsageOnFileThread(file_system_context,
+ origin_url, type);
bool result =
sandbox_file_util_->DeleteDirectoryForOriginAndType(origin_url, type);
@@ -552,7 +555,9 @@ void SandboxMountPointProvider::GetOriginsForHostOnFileThread(
}
int64 SandboxMountPointProvider::GetOriginUsageOnFileThread(
- const GURL& origin_url, fileapi::FileSystemType type) {
+ FileSystemContext* file_system_context,
+ const GURL& origin_url,
+ fileapi::FileSystemType type) {
DCHECK(type == kFileSystemTypeTemporary ||
type == kFileSystemTypePersistent);
FilePath base_path =
@@ -574,7 +579,7 @@ int64 SandboxMountPointProvider::GetOriginUsageOnFileThread(
// Get the directory size now and update the cache.
FileSystemUsageCache::Delete(usage_file_path);
- FileSystemOperationContext context(NULL);
+ FileSystemOperationContext context(file_system_context);
FileSystemPath path(origin_url, type, FilePath());
scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> enumerator(
sandbox_file_util_->CreateFileEnumerator(&context, path, true));
« no previous file with comments | « webkit/fileapi/sandbox_mount_point_provider.h ('k') | webkit/fileapi/sandbox_mount_point_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698