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 69 matching lines @@
   if (!url.is_valid())
     return FilePath();
 
   FilePath root_path;
   if (!isolated_context()->GetRegisteredPath(url.filesystem_id(), &root_path))
     return FilePath();
 
   return root_path.DirName();
 }
 
-bool CrosMountPointProvider::IsAccessAllowed(const GURL& origin_url,
-                                             fileapi::FileSystemType type,
-                                             const FilePath& virtual_path) {
+bool CrosMountPointProvider::IsAccessAllowed(const fileapi::FileSystemURL& ur) {

[kinuko, 2012/08/24 10:17:44]

typo: ur -> url

[calvinlo, 2012/08/25 13:18:10]

Done.

   // TODO(kinuko): this should call CanHandleURL() once
   // http://crbug.com/142267 is fixed.
-  if (type != fileapi::kFileSystemTypeNativeLocal &&
-      type != fileapi::kFileSystemTypeDrive)
+  if (url.type() != fileapi::kFileSystemTypeNativeLocal &&
+      url.type() != fileapi::kFileSystemTypeDrive)
     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());

[kinuko, 2012/08/24 10:17:44]

url.path() -> url.virtual_path()

[calvinlo, 2012/08/25 13:18:10]

Fixed. Sorry I should have looked at the diff more carefully after updating
this.

 }
 
 // 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 159 matching lines @@
   }
   return iter->first.DirName().AppendRelativePath(
       filesystem_path, virtual_path);
 }
 
 fileapi::IsolatedContext* CrosMountPointProvider::isolated_context() const {
   return fileapi::IsolatedContext::GetInstance();
 }
 
 }  // namespace chromeos