Fix filesystem API file_handlers to work for drive on ChromeOS.

webkit/fileapi/isolated_context.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/fileapi/isolated_context.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 283 matching lines @@
   for (; component_iter != components.end(); ++component_iter)
     cracked_path = cracked_path.Append(*component_iter);
   *path = cracked_path;
   return true;
 }
 
 FileSystemURL IsolatedContext::CrackURL(const GURL& url) const {
   FileSystemURL filesystem_url = FileSystemURL(url);
   if (!filesystem_url.is_valid())
     return FileSystemURL();
-  return CreateCrackedFileSystemURL(filesystem_url.origin(),
-                                    filesystem_url.mount_type(),
-                                    filesystem_url.path());
+  return CrackFileSystemURL(filesystem_url);
+}
+
+FileSystemURL IsolatedContext::CrackFileSystemURL(
+    const FileSystemURL& url) const {
+  if (!HandlesFileSystemMountType(url.type()))
+    return FileSystemURL();
+
+  std::string mount_name;
+  FileSystemType cracked_type;
+  base::FilePath cracked_path;
+  if (!CrackVirtualPath(url.path(), &mount_name, &cracked_type, &cracked_path))
+    return FileSystemURL();
+
+  return FileSystemURL(
+      url.origin(), url.mount_type(), url.virtual_path(),
+      !url.filesystem_id().empty() ? url.filesystem_id() : mount_name,
+      cracked_type, cracked_path, mount_name);
 }
 
 FileSystemURL IsolatedContext::CreateCrackedFileSystemURL(
     const GURL& origin,
     FileSystemType type,
     const base::FilePath& path) const {
-  if (!HandlesFileSystemMountType(type))
-    return FileSystemURL();
-
-  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);
+  return CrackFileSystemURL(FileSystemURL(origin, type, path));
 }
 
 void IsolatedContext::RevokeFileSystemByPath(const base::FilePath& path_in) {
   base::AutoLock locker(lock_);
   base::FilePath path(path_in.NormalizePathSeparators());
   PathToID::iterator ids_iter = path_to_id_map_.find(path);
   if (ids_iter == path_to_id_map_.end())
     return;
   std::set<std::string>& ids = ids_iter->second;
   for (std::set<std::string>::iterator iter = ids.begin();
@@ skipping 81 matching lines @@
   uint32 random_data[4];
   std::string id;
   do {
     base::RandBytes(random_data, sizeof(random_data));
     id = base::HexEncode(random_data, sizeof(random_data));
   } while (instance_map_.find(id) != instance_map_.end());
   return id;
 }
 
 }  // namespace fileapi