kFileSystemTypeIsolated should be only used in the URL exposed to renderer

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 47 matching lines @@
 }
 
 CrosMountPointProvider::~CrosMountPointProvider() {
 }
 
 void CrosMountPointProvider::ValidateFileSystemRoot(
     const GURL& origin_url,
     fileapi::FileSystemType type,
     bool create,
     const ValidateFileSystemCallback& callback) {
+  DCHECK(fileapi::IsolatedContext::IsIsolatedType(type));
   // Nothing to validate for external filesystem.
-  DCHECK(type == fileapi::kFileSystemTypeExternal);
   callback.Run(base::PLATFORM_FILE_OK);
 }
 
 FilePath CrosMountPointProvider::GetFileSystemRootPathOnFileThread(
     const GURL& origin_url,
     fileapi::FileSystemType type,
     const FilePath& virtual_path,
     bool create) {
-  DCHECK(type == fileapi::kFileSystemTypeExternal);
+  DCHECK(fileapi::IsolatedContext::IsIsolatedType(type));
   fileapi::FileSystemURL url(origin_url, type, virtual_path);
   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 fileapi::FileSystemURL& url) {
-  // TODO(kinuko): this should call CanHandleURL() once
-  // http://crbug.com/142267 is fixed.
-  if (url.type() != fileapi::kFileSystemTypeNativeLocal &&
-      url.type() != fileapi::kFileSystemTypeDrive)
+  if (!CanHandleURL(url))
     return false;
 
+  // No extra check is needed for isolated file systems.
+  if (url.mount_type() == fileapi::kFileSystemTypeIsolated)
+    return true;
+
   // 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;
 
@@ skipping 170 matching lines @@
   }
   return iter->first.DirName().AppendRelativePath(
       filesystem_path, virtual_path);
 }
 
 fileapi::IsolatedContext* CrosMountPointProvider::isolated_context() const {
   return fileapi::IsolatedContext::GetInstance();
 }
 
 }  // namespace chromeos