Stop returning the true root path of each filesystem from openFileSystem....

webkit/fileapi/sandbox_mount_point_provider_unittest.cc

Index: webkit/fileapi/sandbox_mount_point_provider_unittest.cc
===================================================================
--- webkit/fileapi/sandbox_mount_point_provider_unittest.cc	(revision 77518)
+++ webkit/fileapi/sandbox_mount_point_provider_unittest.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/file_system_path_manager.h"
+#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
@@ -17,424 +17,20 @@
 #include "base/scoped_temp_dir.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/fileapi/file_system_path_manager.h"
+#include "webkit/fileapi/file_system_util.h"
 
 using namespace fileapi;
 
-namespace {
-
-// PS stands for path separator.
-#if defined(FILE_PATH_USES_WIN_SEPARATORS)
-#define PS  "\\"
-#else
-#define PS  "/"
-#endif
-
-struct RootPathTestCase {
-  fileapi::FileSystemType type;
-  const char* origin_url;
-  const char* expected_path;
-};
-
-const struct RootPathTest {
-  fileapi::FileSystemType type;
-  const char* origin_url;
-  const char* expected_path;
-} kRootPathTestCases[] = {
-  { fileapi::kFileSystemTypeTemporary, "http://foo:1/",
-    "http_foo_1" PS "Temporary" },
-  { fileapi::kFileSystemTypePersistent, "http://foo:1/",
-    "http_foo_1" PS "Persistent" },
-  { fileapi::kFileSystemTypeTemporary, "http://bar.com/",
-    "http_bar.com_0" PS "Temporary" },
-  { fileapi::kFileSystemTypePersistent, "http://bar.com/",
-    "http_bar.com_0" PS "Persistent" },
-  { fileapi::kFileSystemTypeTemporary, "https://foo:2/",
-    "https_foo_2" PS "Temporary" },
-  { fileapi::kFileSystemTypePersistent, "https://foo:2/",
-    "https_foo_2" PS "Persistent" },
-  { fileapi::kFileSystemTypeTemporary, "https://bar.com/",
-    "https_bar.com_0" PS "Temporary" },
-  { fileapi::kFileSystemTypePersistent, "https://bar.com/",
-    "https_bar.com_0" PS "Persistent" },
-};
-
-const struct RootPathFileURITest {
-  fileapi::FileSystemType type;
-  const char* origin_url;
-  const char* expected_path;
-} kRootPathFileURITestCases[] = {
-  { fileapi::kFileSystemTypeTemporary, "file:///",
-    "file__0" PS "Temporary" },
-  { fileapi::kFileSystemTypePersistent, "file:///",
-    "file__0" PS "Persistent" },
-};
-
-const struct CheckValidPathTest {
-  FilePath::StringType path;
-  bool expected_valid;
-} kCheckValidPathTestCases[] = {
-  { FILE_PATH_LITERAL("//tmp/foo.txt"), false, },
-  { FILE_PATH_LITERAL("//etc/hosts"), false, },
-  { FILE_PATH_LITERAL("foo.txt"), true, },
-  { FILE_PATH_LITERAL("a/b/c"), true, },
-  // Any paths that includes parent references are considered invalid.
-  { FILE_PATH_LITERAL(".."), false, },
-  { FILE_PATH_LITERAL("tmp/.."), false, },
-  { FILE_PATH_LITERAL("a/b/../c/.."), false, },
-};
-
-const char* const kPathToVirtualPathTestCases[] = {
-  "",
-  "a",
-  "a" PS "b",
-  "a" PS "b" PS "c",
-};
-
-const struct IsRestrictedNameTest {
-  FilePath::StringType name;
-  bool expected_dangerous;
-} kIsRestrictedNameTestCases[] = {
-  // Name that has restricted names in it.
-  { FILE_PATH_LITERAL("con"), true, },
-  { FILE_PATH_LITERAL("Con.txt"), true, },
-  { FILE_PATH_LITERAL("Prn.png"), true, },
-  { FILE_PATH_LITERAL("AUX"), true, },
-  { FILE_PATH_LITERAL("nUl."), true, },
-  { FILE_PATH_LITERAL("coM1"), true, },
-  { FILE_PATH_LITERAL("COM3.com"), true, },
-  { FILE_PATH_LITERAL("cOM7"), true, },
-  { FILE_PATH_LITERAL("com9"), true, },
-  { FILE_PATH_LITERAL("lpT1"), true, },
-  { FILE_PATH_LITERAL("LPT4.com"), true, },
-  { FILE_PATH_LITERAL("lPT8"), true, },
-  { FILE_PATH_LITERAL("lPT9"), true, },
-  // Similar but safe cases.
-  { FILE_PATH_LITERAL("con3"), false, },
-  { FILE_PATH_LITERAL("PrnImage.png"), false, },
-  { FILE_PATH_LITERAL("AUXX"), false, },
-  { FILE_PATH_LITERAL("NULL"), false, },
-  { FILE_PATH_LITERAL("coM0"), false, },
-  { FILE_PATH_LITERAL("COM.com"), false, },
-  { FILE_PATH_LITERAL("lpT0"), false, },
-  { FILE_PATH_LITERAL("LPT.com"), false, },
-
-  // Ends with period or whitespace.
-  { FILE_PATH_LITERAL("b "), true, },
-  { FILE_PATH_LITERAL("b\t"), true, },
-  { FILE_PATH_LITERAL("b\n"), true, },
-  { FILE_PATH_LITERAL("b\r\n"), true, },
-  { FILE_PATH_LITERAL("b."), true, },
-  { FILE_PATH_LITERAL("b.."), true, },
-  // Similar but safe cases.
-  { FILE_PATH_LITERAL("b c"), false, },
-  { FILE_PATH_LITERAL("b\tc"), false, },
-  { FILE_PATH_LITERAL("b\nc"), false, },
-  { FILE_PATH_LITERAL("b\r\nc"), false, },
-  { FILE_PATH_LITERAL("b c d e f"), false, },
-  { FILE_PATH_LITERAL("b.c"), false, },
-  { FILE_PATH_LITERAL("b..c"), false, },
-
-  // Name that has restricted chars in it.
-  { FILE_PATH_LITERAL("a\\b"), true, },
-  { FILE_PATH_LITERAL("a/b"), true, },
-  { FILE_PATH_LITERAL("a<b"), true, },
-  { FILE_PATH_LITERAL("a>b"), true, },
-  { FILE_PATH_LITERAL("a:b"), true, },
-  { FILE_PATH_LITERAL("a?b"), true, },
-  { FILE_PATH_LITERAL("a|b"), true, },
-  { FILE_PATH_LITERAL("ab\\"), true, },
-  { FILE_PATH_LITERAL("ab/.txt"), true, },
-  { FILE_PATH_LITERAL("ab<.txt"), true, },
-  { FILE_PATH_LITERAL("ab>.txt"), true, },
-  { FILE_PATH_LITERAL("ab:.txt"), true, },
-  { FILE_PATH_LITERAL("ab?.txt"), true, },
-  { FILE_PATH_LITERAL("ab|.txt"), true, },
-  { FILE_PATH_LITERAL("\\ab"), true, },
-  { FILE_PATH_LITERAL("/ab"), true, },
-  { FILE_PATH_LITERAL("<ab"), true, },
-  { FILE_PATH_LITERAL(">ab"), true, },
-  { FILE_PATH_LITERAL(":ab"), true, },
-  { FILE_PATH_LITERAL("?ab"), true, },
-  { FILE_PATH_LITERAL("|ab"), true, },
-};
-
-}  // namespace
-
-class FileSystemPathManagerTest : public testing::Test {
+class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test {
  public:
-  FileSystemPathManagerTest()
-      : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
-  }
-
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
-    root_path_callback_status_ = false;
-    root_path_.clear();
-    file_system_name_.clear();
-  }
-
- protected:
-  FileSystemPathManager* NewPathManager(
-      bool incognito,
-      bool allow_file_access) {
-    return new FileSystemPathManager(
-        base::MessageLoopProxy::CreateForCurrentThread(),
-        data_dir_.path(), incognito, allow_file_access);
-  }
-
-  void OnGetRootPath(bool success,
-                           const FilePath& root_path,
-                           const std::string& name) {
-    root_path_callback_status_ = success;
-    root_path_ = root_path;
-    file_system_name_ = name;
-  }
-
-  bool GetRootPath(FileSystemPathManager* manager,
-                   const GURL& origin_url,
-                   fileapi::FileSystemType type,
-                   bool create,
-                   FilePath* root_path) {
-    manager->GetFileSystemRootPath(origin_url, type, create,
-        callback_factory_.NewCallback(
-            &FileSystemPathManagerTest::OnGetRootPath));
-    MessageLoop::current()->RunAllPending();
-    if (root_path)
-      *root_path = root_path_;
-    return root_path_callback_status_;
-  }
-
-  bool CheckValidFileSystemPath(FileSystemPathManager* manager,
-                                const FilePath& path) {
-    return manager->CrackFileSystemPath(path, NULL, NULL, NULL);
-  }
-
-  FilePath data_path() { return data_dir_.path(); }
-  FilePath file_system_path() {
-    return data_dir_.path().Append(
-        FileSystemPathManager::kFileSystemDirectory);
-  }
-
- private:
-  ScopedTempDir data_dir_;
-  base::ScopedCallbackFactory<FileSystemPathManagerTest> callback_factory_;
-
-  bool root_path_callback_status_;
-  FilePath root_path_;
-  std::string file_system_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileSystemPathManagerTest);
-};
-
-TEST_F(FileSystemPathManagerTest, GetRootPathCreateAndExamine) {
-  std::vector<FilePath> returned_root_path(
-      ARRAYSIZE_UNSAFE(kRootPathTestCases));
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-
-  // Create a new root directory.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPath (create) #" << i << " "
-                 << kRootPathTestCases[i].expected_path);
-
-    FilePath root_path;
-    EXPECT_TRUE(GetRootPath(manager.get(),
-                            GURL(kRootPathTestCases[i].origin_url),
-                            kRootPathTestCases[i].type,
-                            true /* create */, &root_path));
-
-    FilePath expected = file_system_path().AppendASCII(
-        kRootPathTestCases[i].expected_path);
-    EXPECT_EQ(expected.value(), root_path.DirName().value());
-    EXPECT_TRUE(file_util::DirectoryExists(root_path));
-    ASSERT_TRUE(returned_root_path.size() > i);
-    returned_root_path[i] = root_path;
-  }
-
-  // Get the root directory with create=false and see if we get the
-  // same directory.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPath (get) #" << i << " "
-                 << kRootPathTestCases[i].expected_path);
-
-    FilePath root_path;
-    EXPECT_TRUE(GetRootPath(manager.get(),
-                            GURL(kRootPathTestCases[i].origin_url),
-                            kRootPathTestCases[i].type,
-                            false /* create */, &root_path));
-    ASSERT_TRUE(returned_root_path.size() > i);
-    EXPECT_EQ(returned_root_path[i].value(), root_path.value());
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, GetRootPathCreateAndExamineWithNewManager) {
-  std::vector<FilePath> returned_root_path(
-      ARRAYSIZE_UNSAFE(kRootPathTestCases));
-  scoped_ptr<FileSystemPathManager> manager1(NewPathManager(false, false));
-  scoped_ptr<FileSystemPathManager> manager2(NewPathManager(false, false));
-
-  GURL origin_url("http://foo.com:1/");
-
-  FilePath root_path1;
-  EXPECT_TRUE(GetRootPath(manager1.get(), origin_url,
-                          kFileSystemTypeTemporary, true, &root_path1));
-  FilePath root_path2;
-  EXPECT_TRUE(GetRootPath(manager2.get(), origin_url,
-                          kFileSystemTypeTemporary, false, &root_path2));
-
-  EXPECT_EQ(root_path1.value(), root_path2.value());
-}
-
-TEST_F(FileSystemPathManagerTest, GetRootPathGetWithoutCreate) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-
-  // Try to get a root directory without creating.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPath (create=false) #" << i << " "
-                 << kRootPathTestCases[i].expected_path);
-    EXPECT_FALSE(GetRootPath(manager.get(),
-                             GURL(kRootPathTestCases[i].origin_url),
-                             kRootPathTestCases[i].type,
-                             false /* create */, NULL));
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, GetRootPathInIncognito) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(
-      true /* incognito */, false));
-
-  // Try to get a root directory.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPath (incognito) #" << i << " "
-                 << kRootPathTestCases[i].expected_path);
-    EXPECT_FALSE(GetRootPath(manager.get(),
-                             GURL(kRootPathTestCases[i].origin_url),
-                             kRootPathTestCases[i].type,
-                             true /* create */, NULL));
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, GetRootPathFileURI) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathFileURITestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPathFileURI (disallow) #"
-                 << i << " " << kRootPathFileURITestCases[i].expected_path);
-    EXPECT_FALSE(GetRootPath(manager.get(),
-                             GURL(kRootPathFileURITestCases[i].origin_url),
-                             kRootPathFileURITestCases[i].type,
-                             true /* create */, NULL));
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, GetRootPathFileURIWithAllowFlag) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(
-      false, true /* allow_file_access_from_files */));
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathFileURITestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "RootPathFileURI (allow) #"
-                 << i << " " << kRootPathFileURITestCases[i].expected_path);
-    FilePath root_path;
-    EXPECT_TRUE(GetRootPath(manager.get(),
-                            GURL(kRootPathFileURITestCases[i].origin_url),
-                            kRootPathFileURITestCases[i].type,
-                            true /* create */, &root_path));
-    FilePath expected = file_system_path().AppendASCII(
-        kRootPathFileURITestCases[i].expected_path);
-    EXPECT_EQ(expected.value(), root_path.DirName().value());
-    EXPECT_TRUE(file_util::DirectoryExists(root_path));
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, VirtualPathFromFileSystemPathTest) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-  FilePath root_path;
-  EXPECT_TRUE(GetRootPath(manager.get(), GURL("http://foo.com/"),
-                          fileapi::kFileSystemTypeTemporary,
-                          true /* create */, &root_path));
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPathToVirtualPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "PathToVirtualPath #"
-                 << i << " " << kPathToVirtualPathTestCases[i]);
-    FilePath absolute_path = root_path.AppendASCII(
-        kPathToVirtualPathTestCases[i]);
-    FilePath virtual_path;
-    EXPECT_TRUE(manager->CrackFileSystemPath(absolute_path, NULL, NULL,
-                                             &virtual_path));
-
-    FilePath test_case_path;
-    test_case_path = test_case_path.AppendASCII(
-        kPathToVirtualPathTestCases[i]);
-    EXPECT_EQ(test_case_path.value(), virtual_path.value());
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, TypeFromFileSystemPathTest) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-
-  FilePath root_path;
-  fileapi::FileSystemType type;
-
-  EXPECT_TRUE(GetRootPath(manager.get(), GURL("http://foo.com/"),
-                          fileapi::kFileSystemTypeTemporary,
-                          true /* create */, &root_path));
-  FilePath path = root_path.AppendASCII("test");
-  EXPECT_TRUE(manager->CrackFileSystemPath(path, NULL, &type, NULL));
-  EXPECT_EQ(fileapi::kFileSystemTypeTemporary, type);
-
-  EXPECT_TRUE(GetRootPath(manager.get(), GURL("http://foo.com/"),
-                          fileapi::kFileSystemTypePersistent,
-                          true /* create */, &root_path));
-  path = root_path.AppendASCII("test");
-  EXPECT_TRUE(manager->CrackFileSystemPath(path, NULL, &type, NULL));
-  EXPECT_EQ(fileapi::kFileSystemTypePersistent, type);
-}
-
-TEST_F(FileSystemPathManagerTest, CheckValidPath) {
-  scoped_ptr<FileSystemPathManager> manager(NewPathManager(false, false));
-  FilePath root_path;
-  EXPECT_TRUE(GetRootPath(manager.get(), GURL("http://foo.com/"),
-                          kFileSystemTypePersistent, true, &root_path));
-
-  // The root path must be valid, but upper directories or directories
-  // that are not in our temporary or persistent directory must be
-  // evaluated invalid.
-  EXPECT_TRUE(CheckValidFileSystemPath(manager.get(), root_path));
-  EXPECT_FALSE(CheckValidFileSystemPath(manager.get(), root_path.DirName()));
-  EXPECT_FALSE(CheckValidFileSystemPath(manager.get(),
-                                        root_path.DirName().DirName()));
-  EXPECT_FALSE(CheckValidFileSystemPath(manager.get(),
-                                        root_path.DirName().DirName()
-                                            .AppendASCII("ArbitraryName")
-                                            .AppendASCII("chrome-dummy")));
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kCheckValidPathTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "CheckValidPath #" << i << " "
-                 << kCheckValidPathTestCases[i].path);
-    FilePath path(kCheckValidPathTestCases[i].path);
-    if (!path.IsAbsolute())
-      path = root_path.Append(path);
-    EXPECT_EQ(kCheckValidPathTestCases[i].expected_valid,
-              CheckValidFileSystemPath(manager.get(), path));
-  }
-}
-
-TEST_F(FileSystemPathManagerTest, IsRestrictedName) {
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kIsRestrictedNameTestCases); ++i) {
-    SCOPED_TRACE(testing::Message() << "IsRestrictedName #" << i << " "
-                 << kIsRestrictedNameTestCases[i].name);
-    FilePath name(kIsRestrictedNameTestCases[i].name);
-    EXPECT_EQ(kIsRestrictedNameTestCases[i].expected_dangerous,
-              FileSystemPathManager::IsRestrictedFileName(name));
-  }
-}
-
-class FileSystemPathManagerOriginEnumeratorTest : public testing::Test {
- public:
-  void SetUp() {
-    ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
-    enumerator_.reset(new FileSystemPathManager::OriginEnumerator(
+    enumerator_.reset(new SandboxMountPointProvider::OriginEnumerator(
         data_dir_.path()));
   }
 
-  FileSystemPathManager::OriginEnumerator* enumerator() const {
+  SandboxMountPointProvider::OriginEnumerator* enumerator() const {
     return enumerator_.get();
   }
 
@@ -451,14 +47,14 @@
   }
 
   ScopedTempDir data_dir_;
-  scoped_ptr<FileSystemPathManager::OriginEnumerator> enumerator_;
+  scoped_ptr<SandboxMountPointProvider::OriginEnumerator> enumerator_;
 };
 
-TEST_F(FileSystemPathManagerOriginEnumeratorTest, Empty) {
+TEST_F(SandboxMountPointProviderOriginEnumeratorTest, Empty) {
   ASSERT_TRUE(enumerator()->Next().empty());
 }
 
-TEST_F(FileSystemPathManagerOriginEnumeratorTest, EnumerateOrigins) {
+TEST_F(SandboxMountPointProviderOriginEnumeratorTest, EnumerateOrigins) {
   const char* temporary_origins[] = {
     "http_www.bar.com_0",
     "http_www.foo.com_0",