Make isolated file system works for a device root (e.g. X:\\)

webkit/support/webkit_support.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/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 754 matching lines @@
 // FileSystem
 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
     long long size, bool create, WebFileSystemCallbacks* callbacks) {
   SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
       test_environment->webkit_platform_support()->fileSystem());
   fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
 }
 
 WebKit::WebString RegisterIsolatedFileSystem(
     const WebKit::WebVector<WebKit::WebString>& filenames) {
-  std::set<FilePath> files;
-  for (size_t i = 0; i < filenames.size(); ++i)
-    files.insert(webkit_glue::WebStringToFilePath(filenames[i]));
+  std::vector<fileapi::IsolatedContext::FileInfo> files;
+  for (size_t i = 0; i < filenames.size(); ++i) {
+    FilePath path = webkit_glue::WebStringToFilePath(filenames[i]);
+    files.push_back(fileapi::IsolatedContext::FileInfo(
+            fileapi::IsolatedContext::GetNameForPath(path), path));
+  }
   std::string filesystemId =
-      fileapi::IsolatedContext::GetInstance()->RegisterIsolatedFileSystem(
-          files);
+      fileapi::IsolatedContext::GetInstance()->RegisterFileSystem(files);
   return UTF8ToUTF16(filesystemId);
 }
 
 // Keyboard code
 #if defined(TOOLKIT_GTK)
 int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift) {
   ui::KeyboardCode code = static_cast<ui::KeyboardCode>(keycode);
   return ui::GdkNativeKeyCodeForWindowsKeyCode(code, shift);
 }
 #endif
 
 // Timers
 double GetForegroundTabTimerInterval() {
   return webkit_glue::kForegroundTabTimerInterval;
 }
 
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support