Changed FileSystemPointProvider::IsAcccessAllowed() to take a single FileSystemURL instead of a tri…

webkit/chromeos/fileapi/cros_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/chromeos/fileapi/cros_mount_point_provider.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 78 matching lines @@
     const FilePath& virtual_path,
     bool create) {
   DCHECK(type == fileapi::kFileSystemTypeExternal);
   FilePath root_path;
   if (!GetRootForVirtualPath(virtual_path, &root_path))
     return FilePath();
 
   return root_path;
 }
 
-bool CrosMountPointProvider::IsAccessAllowed(const GURL& origin_url,
-                                             fileapi::FileSystemType type,
-                                             const FilePath& virtual_path) {
-  if (type != fileapi::kFileSystemTypeExternal)
+bool CrosMountPointProvider::IsAccessAllowed(
+      const fileapi::FileSystemURL& url) {
+  if (url.type() != fileapi::kFileSystemTypeExternal)
     return false;
 
   // Permit access to mount points from internal WebUI.
+  const GURL& origin_url = url.origin();
   if (origin_url.SchemeIs(kChromeUIScheme))
     return true;
 
   std::string extension_id = origin_url.host();
   // Check first to make sure this extension has fileBrowserHander permissions.
   if (!special_storage_policy_->IsFileHandler(extension_id))
     return false;
 
   return file_access_permissions_->HasAccessPermission(extension_id,
-                                                       virtual_path);
+                                                       url.path());
 }
 
 // TODO(zelidrag): Share this code with SandboxMountPointProvider impl.
 bool CrosMountPointProvider::IsRestrictedFileName(const FilePath& path) const {
   return false;
 }
 
 fileapi::FileSystemQuotaUtil* CrosMountPointProvider::GetQuotaUtil() {
   // No quota support.
   return NULL;
@@ skipping 169 matching lines @@
     if (mount_prefix == filesystem_path) {
       return true;
     } else if (mount_prefix.AppendRelativePath(filesystem_path, virtual_path)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace chromeos