Merge 170159

webkit/fileapi/sandbox_mount_point_provider.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 "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 424 matching lines @@
   return false;
 }
 
 FileSystemFileUtil* SandboxMountPointProvider::GetFileUtil(
     FileSystemType type) {
   return sandbox_file_util_.get();
 }
 
 FilePath SandboxMountPointProvider::GetPathForPermissionsCheck(
     const FilePath& virtual_path) const {
-  // We simply return the very top directory of the sandbox
-  // filesystem regardless of the input path.
-  return new_base_path();
+  // Sandbox provider shouldn't directly grant permissions for its
+  // data directory.
+  return FilePath();
 }
 
 FileSystemOperation* SandboxMountPointProvider::CreateFileSystemOperation(
     const FileSystemURL& url,
     FileSystemContext* context,
     base::PlatformFileError* error_code) const {
   scoped_ptr<FileSystemOperationContext> operation_context(
       new FileSystemOperationContext(context));
 
   // Copy the observer lists (assuming we only have small number of observers).
@@ skipping 316 matching lines @@
        i < file_system_options_.additional_allowed_schemes().size();
        ++i) {
     if (url.SchemeIs(
             file_system_options_.additional_allowed_schemes()[i].c_str()))
       return true;
   }
   return false;
 }
 
 }  // namespace fileapi