Fix filesystem API file_handlers to work for drive on ChromeOS.

webkit/fileapi/external_mount_points.cc

 // Copyright (c) 2013 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/external_mount_points.h"
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 207 matching lines @@
   std::string mount_name;
   FileSystemType cracked_type;
   base::FilePath cracked_path;
   if (!CrackVirtualPath(path, &mount_name, &cracked_type, &cracked_path))
     return FileSystemURL();
 
   return FileSystemURL(origin, type, path,
                        mount_name, cracked_type, cracked_path);
 }
 
+bool ExternalMountPoints::GetVirtualPath(const base::FilePath& full_path,
+                                         base::FilePath* virtual_path) const {
+  DCHECK(virtual_path);
+
+  base::AutoLock locker(lock_);
+
+  base::FilePath path = NormalizeFilePath(full_path);
+  std::map<base::FilePath, std::string>::const_reverse_iterator iter(
+      path_to_name_map_.upper_bound(path));
+  if (iter == path_to_name_map_.rend())
+    return false;
+
+  *virtual_path = CreateVirtualRootPath(iter->second);
+  if (iter->first == path)
+    return true;
+  return iter->first.AppendRelativePath(path, virtual_path);
+}
+
 RemoteFileSystemProxyInterface* ExternalMountPoints::GetRemoteFileSystemProxy(
     const std::string& mount_name) const {
   base::AutoLock locker(lock_);
   NameToInstance::const_iterator found = instance_map_.find(mount_name);
   if (found == instance_map_.end())
     return NULL;
   return found->second->remote_proxy();
 }
 
 void ExternalMountPoints::AddMountPointInfosTo(
     std::vector<MountPointInfo>* mount_points) const {
   base::AutoLock locker(lock_);
   DCHECK(mount_points);
   for (NameToInstance::const_iterator iter = instance_map_.begin();
        iter != instance_map_.end(); ++iter) {
     mount_points->push_back(MountPointInfo(iter->first, iter->second->path()));
   }
 }
 
-bool ExternalMountPoints::GetVirtualPath(const base::FilePath& path_in,
-                                         base::FilePath* virtual_path) {
-  DCHECK(virtual_path);
-
-  base::AutoLock locker(lock_);
-
-  base::FilePath path = NormalizeFilePath(path_in);
-  std::map<base::FilePath, std::string>::reverse_iterator iter(
-      path_to_name_map_.upper_bound(path));
-  if (iter == path_to_name_map_.rend())
-    return false;
-
-  *virtual_path = CreateVirtualRootPath(iter->second);
-  if (iter->first == path)
-    return true;
-  return iter->first.AppendRelativePath(path, virtual_path);
-}
-
 base::FilePath ExternalMountPoints::CreateVirtualRootPath(
     const std::string& mount_name) const {
   return base::FilePath().AppendASCII(mount_name);
 }
 
 ExternalMountPoints::ExternalMountPoints() {}
 
 ExternalMountPoints::~ExternalMountPoints() {
   STLDeleteContainerPairSecondPointers(instance_map_.begin(),
                                        instance_map_.end());
@@ skipping 50 matching lines @@
 base::FilePath ScopedExternalFileSystem::GetVirtualRootPath() const {
   return ExternalMountPoints::GetSystemInstance()->
       CreateVirtualRootPath(mount_name_);
 }
 
 ScopedExternalFileSystem::~ScopedExternalFileSystem() {
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(mount_name_);
 }
 
 }  // namespace fileapi