diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 02:41:27 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 02:41:27 +0000 |
| commit | a64a12806c27b34f686cf66700da56b812a9c199 (patch) | |
| tree | b15e6256966f0458ca2c7e07d8c574077e5d4dc4 /chrome | |
| parent | 20e1f11cf353fb6f89c1d909c435f30910951c1e (diff) | |
| download | chromium_src-a64a12806c27b34f686cf66700da56b812a9c199.zip chromium_src-a64a12806c27b34f686cf66700da56b812a9c199.tar.gz chromium_src-a64a12806c27b34f686cf66700da56b812a9c199.tar.bz2 | |
Revert 63619 - Workers who want to use FileWriter need to be granted permission to access files in the user's FileSystem directory.
BUG=none; you need tests I haven't checked in yet to repro this problem.
TEST=none; tests are in review, but will go in after this fix.
Review URL: http://codereview.chromium.org/3991007
TBR=ericu@google.com
Review URL: http://codereview.chromium.org/3996009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/worker_host/worker_process_host.cc | 23 |
2 files changed, 2 insertions, 25 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 6a231a3..b7af07f 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -33,7 +33,6 @@ #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/file_system/file_system_host_context.h" #include "chrome/browser/gpu_process_host.h" #include "chrome/browser/history/history.h" #include "chrome/browser/io_thread.h" @@ -238,7 +237,8 @@ BrowserRenderProcessHost::BrowserRenderProcessHost(Profile* profile) // PLATFORM_FILE_DELETE_ON_CLOSE are not granted, because no existing API // requests them. ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile( - id(), profile->GetFileSystemHostContext()->path_manager()->base_path(), + id(), profile->GetPath().Append( + fileapi::FileSystemPathManager::kFileSystemDirectory), base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_OPEN_ALWAYS | diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc index 4bb38c0..c8df23d 100644 --- a/chrome/browser/worker_host/worker_process_host.cc +++ b/chrome/browser/worker_host/worker_process_host.cc @@ -37,7 +37,6 @@ #include "net/base/mime_util.h" #include "ipc/ipc_switches.h" #include "net/base/registry_controlled_domain.h" -#include "webkit/fileapi/file_system_path_manager.h" // Notifies RenderViewHost that one or more worker objects crashed. class WorkerCrashTask : public Task { @@ -185,28 +184,6 @@ bool WorkerProcessHost::Init() { cmd_line); ChildProcessSecurityPolicy::GetInstance()->Add(id()); - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableFileSystem)) { - // Grant most file permissions to this worker. - // PLATFORM_FILE_TEMPORARY, PLATFORM_FILE_HIDDEN and - // PLATFORM_FILE_DELETE_ON_CLOSE are not granted, because no existing API - // requests them. - ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile( - id(), - request_context_->file_system_host_context()-> - path_manager()->base_path(), - base::PLATFORM_FILE_OPEN | - base::PLATFORM_FILE_CREATE | - base::PLATFORM_FILE_OPEN_ALWAYS | - base::PLATFORM_FILE_CREATE_ALWAYS | - base::PLATFORM_FILE_READ | - base::PLATFORM_FILE_WRITE | - base::PLATFORM_FILE_EXCLUSIVE_READ | - base::PLATFORM_FILE_EXCLUSIVE_WRITE | - base::PLATFORM_FILE_ASYNC | - base::PLATFORM_FILE_TRUNCATE | - base::PLATFORM_FILE_WRITE_ATTRIBUTES); - } return true; } |