Enables internal filesystem types via Isolated filesystems

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 "webkit/fileapi/isolated_context.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 33 matching lines @@
 
 class IsolatedContextTest : public testing::Test {
  public:
   IsolatedContextTest() {
     for (size_t i = 0; i < arraysize(kTestPaths); ++i)
       fileset_.insert(kTestPaths[i].NormalizePathSeparators());
   }
 
   void SetUp() {
     IsolatedContext::FileInfoSet files;
-    for (size_t i = 0; i < arraysize(kTestPaths); ++i)
-      names_.push_back(files.AddPath(kTestPaths[i].NormalizePathSeparators()));
-    id_ = IsolatedContext::GetInstance()->RegisterFileSystem(files);
+    for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
+      std::string name;
+      ASSERT_TRUE(
+          files.AddPath(kTestPaths[i].NormalizePathSeparators(), &name));
+      names_.push_back(name);
+    }
+    id_ = IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
     ASSERT_FALSE(id_.empty());
   }
 
   void TearDown() {
     IsolatedContext::GetInstance()->RevokeFileSystem(id_);
   }
 
   IsolatedContext* isolated_context() const {
     return IsolatedContext::GetInstance();
   }
 
  protected:
   std::string id_;
   std::multiset<FilePath> fileset_;
   std::vector<std::string> names_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IsolatedContextTest);
 };
 
 TEST_F(IsolatedContextTest, RegisterAndRevokeTest) {
   // See if the returned top-level entries match with what we registered.
   std::vector<FileInfo> toplevels;
-  ASSERT_TRUE(isolated_context()->GetRegisteredFileInfo(id_, &toplevels));
+  ASSERT_TRUE(isolated_context()->GetDraggedFileInfo(id_, &toplevels));
   ASSERT_EQ(fileset_.size(), toplevels.size());
   for (size_t i = 0; i < toplevels.size(); ++i) {
     ASSERT_TRUE(fileset_.find(toplevels[i].path) != fileset_.end());
   }
 
   // See if the name of each registered kTestPaths (that is what we
-  // register in SetUp() by RegisterFileSystem) is properly cracked as
+  // 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;
     FileInfo root_info;
     FilePath cracked_path;
     ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
         virtual_path, &cracked_id, &root_info, &cracked_path));
     ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(),
               cracked_path.value());
     ASSERT_TRUE(fileset_.find(root_info.path.NormalizePathSeparators())
                 != fileset_.end());
     ASSERT_EQ(id_, cracked_id);
   }
 
-  // Revoking the current one and registering a new (empty) one.
+  // Make sure GetRegisteredPath returns false for id_ since it is
+  // registered for dragged files.
+  FilePath path;
+  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
+
+  // Revoking the current one and registering a new one.
   isolated_context()->RevokeFileSystem(id_);
-  std::string id2 = isolated_context()->RegisterFileSystem(
-      IsolatedContext::FileInfoSet());
+  std::string id2 = isolated_context()->RegisterFileSystemForPath(
+      kFileSystemTypeIsolated, FilePath(DRIVE FPL("/foo")), NULL);
 
-  // Make sure the GetRegisteredFileInfo returns true only for the new one.
-  ASSERT_TRUE(isolated_context()->GetRegisteredFileInfo(id2, &toplevels));
-  ASSERT_FALSE(isolated_context()->GetRegisteredFileInfo(id_, &toplevels));
+  // 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_TRUE(isolated_context()->GetRegisteredPath(id2, &path));
+  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
 
   isolated_context()->RevokeFileSystem(id2);
 }
 
 TEST_F(IsolatedContextTest, CrackWithRelativePaths) {
   const struct {
     FilePath::StringType path;
     bool valid;
   } relatives[] = {
     { FPL("foo"), true },
@@ skipping 51 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