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 55 matching lines @@
 
   // See if the name of each registered kTestPaths (that is what we
   // register in SetUp() by RegisterDraggedFileSystem) is properly cracked as
   // a valid virtual path in the isolated filesystem.
   for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
     FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_)
         .AppendASCII(names_[i]);
     std::string cracked_id;
     FilePath cracked_path;
     FileSystemType cracked_type;
-    ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
+    ASSERT_TRUE(isolated_context()->CrackVirtualPath(
         virtual_path, &cracked_id, &cracked_type, &cracked_path));
     ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(),
               cracked_path.value());
     ASSERT_EQ(id_, cracked_id);
     ASSERT_EQ(kFileSystemTypeDragged, cracked_type);
   }
 
   // Make sure GetRegisteredPath returns false for id_ since it is
   // registered for dragged files.
   FilePath path;
@@ skipping 75 matching lines @@
   for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(relatives); ++j) {
       SCOPED_TRACE(testing::Message() << "Testing "
                    << kTestPaths[i].value() << " " << relatives[j].path);
       FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_)
           .AppendASCII(names_[i]).Append(relatives[j].path);
       std::string cracked_id;
       FilePath cracked_path;
     FileSystemType cracked_type;
       if (!relatives[j].valid) {
-        ASSERT_FALSE(isolated_context()->CrackIsolatedPath(
+        ASSERT_FALSE(isolated_context()->CrackVirtualPath(
             virtual_path, &cracked_id, &cracked_type, &cracked_path));
         continue;
       }
-      ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
+      ASSERT_TRUE(isolated_context()->CrackVirtualPath(
           virtual_path, &cracked_id, &cracked_type, &cracked_path));
       ASSERT_EQ(kTestPaths[i].Append(relatives[j].path)
                     .NormalizePathSeparators().value(),
                 cracked_path.value());
       ASSERT_EQ(id_, cracked_id);
       ASSERT_EQ(kFileSystemTypeDragged, cracked_type);
     }
   }
 }
 
 TEST_F(IsolatedContextTest, TestWithVirtualRoot) {
   std::string cracked_id;
   FilePath cracked_path;
 
   // Trying to crack virtual root "/" returns true but with empty cracked path
   // as "/" of the isolated filesystem is a pure virtual directory
   // that has no corresponding platform directory.
   FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_);
-  ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
+  ASSERT_TRUE(isolated_context()->CrackVirtualPath(
       virtual_path, &cracked_id, NULL, &cracked_path));
   ASSERT_EQ(FPL(""), cracked_path.value());
   ASSERT_EQ(id_, cracked_id);
 
   // 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(
+  ASSERT_FALSE(isolated_context()->CrackVirtualPath(
       virtual_path, &cracked_id, NULL, &cracked_path));
 }
 
 }  // namespace fileapi