Fix filesystem API file_handlers to work for drive on ChromeOS.

webkit/chromeos/fileapi/cros_mount_point_provider.h

 // 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.
 
 #ifndef WEBKIT_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 79 matching lines @@
 
   // fileapi::ExternalFileSystemMountPointProvider overrides.
   virtual std::vector<base::FilePath> GetRootDirectories() const OVERRIDE;
   virtual void GrantFullAccessToExtension(
       const std::string& extension_id) OVERRIDE;
   virtual void GrantFileAccessToExtension(
       const std::string& extension_id, const base::FilePath& virtual_path) OVERRIDE;
   virtual void RevokeAccessForExtension(
       const std::string& extension_id) OVERRIDE;
   virtual bool GetVirtualPath(const base::FilePath& filesystem_path,
-                              base::FilePath* virtual_path) OVERRIDE;
+                              base::FilePath* virtual_path) const OVERRIDE;
 
  private:
+  // If |original| is isolated filesystem URL, returns filesystem URL with the
+  // same path (as FileSystemURL::path()), but mapped by available external
+  // mount points.
+  // If the original filesystem URL already is external filesystem URL, returns
+  // |original|.
+  fileapi::FileSystemURL GetAsExternalFileSystemURL(
+      const fileapi::FileSystemURL& original) const;
   fileapi::RemoteFileSystemProxyInterface* GetRemoteProxy(
-      const std::string& mount_name) const;
+      const fileapi::FileSystemURL& url) const;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_ptr<FileAccessPermissions> file_access_permissions_;
   scoped_ptr<fileapi::AsyncFileUtilAdapter> local_file_util_;
 
   // Mount points specific to the owning context.
   //
   // Add/Remove MountPoints will affect only these mount points.
   //
   // It is legal to have mount points with the same name as in
   // system_mount_points_. Also, mount point paths may overlap with mount point
   // paths in system_mount_points_. In both cases mount points in
   // |mount_points_| will have a priority.
   // E.g. if |mount_points_| map 'foo1' to '/foo/foo1' and
   // |file_system_mount_points_| map 'xxx' to '/foo/foo1/xxx', |GetVirtualPaths|
   // will resolve '/foo/foo1/xxx/yyy' as 'foo1/xxx/yyy' (i.e. the mapping from
   // |mount_points_| will be used).
   scoped_refptr<fileapi::ExternalMountPoints> mount_points_;
 
   // Globally visible mount points. System MountPonts instance should outlive
   // all CrosMountPointProvider instances, so raw pointer is safe.
   fileapi::ExternalMountPoints* system_mount_points_;
 
   DISALLOW_COPY_AND_ASSIGN(CrosMountPointProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // WEBKIT_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_