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

Unified Diff: webkit/fileapi/sandbox_mount_point_provider.cc

Issue 10449028: Revert 138444 - Always pass FileSystemContext to ObfuscatedFileUtil operations (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1151/src/
Patch Set: 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
===================================================================
--- webkit/fileapi/sandbox_mount_point_provider.cc (revision 139069)
+++ webkit/fileapi/sandbox_mount_point_provider.cc (working copy)
@@ -498,14 +498,11 @@
}
bool SandboxMountPointProvider::DeleteOriginDataOnFileThread(
- FileSystemContext* file_system_context,
- QuotaManagerProxy* proxy,
- const GURL& origin_url,
+ QuotaManagerProxy* proxy, const GURL& origin_url,
fileapi::FileSystemType type) {
MigrateIfNeeded(sandbox_file_util_.get(), old_base_path());
- int64 usage = GetOriginUsageOnFileThread(file_system_context,
- origin_url, type);
+ int64 usage = GetOriginUsageOnFileThread(origin_url, type);
bool result =
sandbox_file_util_->DeleteDirectoryForOriginAndType(origin_url, type);
@@ -555,9 +552,7 @@
}
int64 SandboxMountPointProvider::GetOriginUsageOnFileThread(
- FileSystemContext* file_system_context,
- const GURL& origin_url,
- fileapi::FileSystemType type) {
+ const GURL& origin_url, fileapi::FileSystemType type) {
DCHECK(type == kFileSystemTypeTemporary ||
type == kFileSystemTypePersistent);
FilePath base_path =
@@ -579,7 +574,7 @@
// Get the directory size now and update the cache.
FileSystemUsageCache::Delete(usage_file_path);
- FileSystemOperationContext context(file_system_context);
+ FileSystemOperationContext context(NULL);
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