Merge 170159

content/browser/worker_host/worker_process_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/worker_host/worker_process_host.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 182 matching lines @@
 #if defined(OS_WIN)
       FilePath(),
 #elif defined(OS_POSIX)
       use_zygote,
       base::EnvironmentVector(),
 #endif
       cmd_line);
 
   ChildProcessSecurityPolicyImpl::GetInstance()->AddWorker(
       process_->GetData().id, render_process_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.
-    // This is for the filesystem sandbox.
-    ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile(
-        process_->GetData().id,
-        partition_.filesystem_context()->sandbox_provider()->new_base_path(),
-        base::PLATFORM_FILE_OPEN |
-        base::PLATFORM_FILE_CREATE |
-        base::PLATFORM_FILE_OPEN_ALWAYS |
-        base::PLATFORM_FILE_CREATE_ALWAYS |
-        base::PLATFORM_FILE_OPEN_TRUNCATED |
-        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_WRITE_ATTRIBUTES |
-        base::PLATFORM_FILE_ENUMERATE);
-    // This is so that we can read and move stuff out of the old filesystem
-    // sandbox.
-    ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile(
-        process_->GetData().id,
-        partition_.filesystem_context()->sandbox_provider()->old_base_path(),
-        base::PLATFORM_FILE_READ | base::PLATFORM_FILE_WRITE |
-            base::PLATFORM_FILE_WRITE_ATTRIBUTES |
-            base::PLATFORM_FILE_ENUMERATE);
-    // This is so that we can rename the old sandbox out of the way so that
-    // we know we've taken care of it.
-    ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile(
-        process_->GetData().id,
-        partition_.filesystem_context()->sandbox_provider()->
-            renamed_old_base_path(),
-        base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_CREATE_ALWAYS |
-            base::PLATFORM_FILE_WRITE);
-  }
-
   CreateMessageFilters(render_process_id);
 
   return true;
 }
 
 void WorkerProcessHost::CreateMessageFilters(int render_process_id) {
   ChromeBlobStorageContext* blob_storage_context =
       GetChromeBlobStorageContextForResourceContext(resource_context_);
 
   net::URLRequestContextGetter* url_request_context =
@@ skipping 453 matching lines @@
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::FilterInfo
 WorkerProcessHost::WorkerInstance::GetFilter() const {
   DCHECK(NumFilters() == 1);
   return *filters_.begin();
 }
 
 }  // namespace content