Extract external file systems handling from isolated context.

webkit/fileapi/isolated_context_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/isolated_context.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 #if defined(FILE_PATH_USES_DRIVE_LETTERS)
 #define DRIVE FPL("C:")
 #else
 #define DRIVE
 #endif
 
 namespace fileapi {
 
-typedef IsolatedContext::FileInfo FileInfo;
+typedef IsolatedContext::MountPointInfo FileInfo;
 
 namespace {
 
 const FilePath kTestPaths[] = {
   FilePath(DRIVE FPL("/a/b.txt")),
   FilePath(DRIVE FPL("/c/d/e")),
   FilePath(DRIVE FPL("/h/")),
   FilePath(DRIVE FPL("/")),
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
   FilePath(DRIVE FPL("\\foo\\bar")),
@@ skipping 72 matching lines @@
 
   // Make sure GetRegisteredPath returns false for id_ since it is
   // registered for dragged files.
   FilePath path;
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
 
   // Deref the current one and registering a new one.
   isolated_context()->RemoveReference(id_);
 
   std::string id2 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, FilePath(DRIVE FPL("/foo")), NULL);
+      kFileSystemTypeIsolatedNativeLocal, FilePath(DRIVE FPL("/foo")), NULL);
 
   // Make sure the GetDraggedFileInfo returns false for both ones.
   ASSERT_FALSE(isolated_context()->GetDraggedFileInfo(id2, &toplevels));
   ASSERT_FALSE(isolated_context()->GetDraggedFileInfo(id_, &toplevels));
 
   // Make sure the GetRegisteredPath returns true only for the new one.
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id2, &path));
 
   // Try registering three more file systems for the same path as id2.
   std::string id3 = isolated_context()->RegisterFileSystemForPath(
       kFileSystemTypeNativeLocal, path, NULL);
   std::string id4 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, path, NULL);
+      kFileSystemTypeIsolatedNativeLocal, path, NULL);
   std::string id5 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, path, NULL);
+      kFileSystemTypeIsolatedNativeLocal, path, NULL);
 
   // Remove file system for id4.
   isolated_context()->AddReference(id4);
   isolated_context()->RemoveReference(id4);
 
   // Only id4 should become invalid now.
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id2, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id3, &path));
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id4, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id5, &path));
@@ skipping 79 matching lines @@
 
   // Trying to crack "/foo" should fail (because "foo" is not the one
   // included in the kTestPaths).
   virtual_path = isolated_context()->CreateVirtualRootPath(
       id_).AppendASCII("foo");
   ASSERT_FALSE(isolated_context()->CrackIsolatedPath(
       virtual_path, &cracked_id, NULL, &cracked_path));
 }
 
 }  // namespace fileapi