Adding RevokeFileSystemByPath

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 40 matching lines @@
 
   void SetUp() {
     IsolatedContext::FileInfoSet 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);
+    IsolatedContext::GetInstance()->AddReference(id_);
     ASSERT_FALSE(id_.empty());
   }
 
   void TearDown() {
-    IsolatedContext::GetInstance()->RevokeFileSystem(id_);
+    IsolatedContext::GetInstance()->RemoveReference(id_);
   }
 
   IsolatedContext* isolated_context() const {
     return IsolatedContext::GetInstance();
   }
 
  protected:
   std::string id_;
   std::multiset<FilePath> fileset_;
   std::vector<std::string> names_;
@@ skipping 26 matching lines @@
               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;
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
 
-  // Revoking the current one and registering a new one.
-  isolated_context()->RevokeFileSystem(id_);
+  // Deref the current one and registering a new one.
+  isolated_context()->RemoveReference(id_);
+
   std::string id2 = isolated_context()->RegisterFileSystemForPath(
       kFileSystemTypeIsolated, 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));
-  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
 
-  isolated_context()->RevokeFileSystem(id2);
+  // Try registering two more file systems for the same path as id2.
+  std::string id3 = isolated_context()->RegisterFileSystemForPath(
+      kFileSystemTypeIsolated, path, NULL);
+  std::string id4 = isolated_context()->RegisterFileSystemForPath(
+      kFileSystemTypeIsolated, 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));
+
+  // Revoke the file systems by path.
+  isolated_context()->RevokeFileSystemByPath(path);
+
+  // Now all the file systems associated to the path must be invalid.
+  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id2, &path));
+  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id3, &path));
+  ASSERT_FALSE(isolated_context()->GetRegisteredPath(id4, &path));
 }
 
 TEST_F(IsolatedContextTest, CrackWithRelativePaths) {
   const struct {
     FilePath::StringType path;
     bool valid;
   } relatives[] = {
     { FPL("foo"), true },
     { FPL("foo/bar"), true },
     { FPL(".."), false },
@@ skipping 48 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