summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 06:39:06 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-20 06:39:06 +0000
commit457ddb83fdd89aecce7297c70de7d114a76fb664 (patch)
tree53a478f5e282d75f3ae233259528250becb01849 /content/browser/fileapi
parent76f9f04ee46b731646f29e9dfb6dbba3fc878684 (diff)
downloadchromium_src-457ddb83fdd89aecce7297c70de7d114a76fb664.zip
chromium_src-457ddb83fdd89aecce7297c70de7d114a76fb664.tar.gz
chromium_src-457ddb83fdd89aecce7297c70de7d114a76fb664.tar.bz2
Cleanup: Don't use FileSystemContext::sandbox_provider() when possible
It's going to be a private method exposed only to SandboxFileSystemTestHelper. BUG=250791 TEST=content_unittests:*File* R=tzik@chromium.org Review URL: https://codereview.chromium.org/17419006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi')
-rw-r--r--content/browser/fileapi/browser_file_system_helper.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc
index 03b7682..83de4cc 100644
--- a/content/browser/fileapi/browser_file_system_helper.cc
+++ b/content/browser/fileapi/browser_file_system_helper.cc
@@ -19,10 +19,10 @@
#include "content/public/common/url_constants.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/browser/fileapi/file_permission_policy.h"
+#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
#include "webkit/browser/fileapi/file_system_operation_runner.h"
#include "webkit/browser/fileapi/file_system_options.h"
#include "webkit/browser/fileapi/file_system_task_runners.h"
-#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
#include "webkit/browser/quota/quota_manager.h"
namespace content {
@@ -106,7 +106,7 @@ bool CheckFileSystemPermissionsForProcess(
*error = base::PLATFORM_FILE_ERROR_SECURITY;
return false;
case fileapi::FILE_PERMISSION_ALWAYS_ALLOW:
- CHECK(mount_point_provider == context->sandbox_provider());
+ CHECK(context->IsSandboxFileSystem(url.type()));
return true;
case fileapi::FILE_PERMISSION_USE_FILE_PERMISSION: {
const bool success = policy->HasPermissionsForFile(