Manage IsolatedContext with reference counts

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 28 matching lines @@
     for (size_t i = 0; i < arraysize(kTestPaths); ++i)
       fileset_.insert(kTestPaths[i].NormalizePathSeparators());
   }
 
   void SetUp() {
     id_ = IsolatedContext::GetInstance()->RegisterIsolatedFileSystem(fileset_);
     ASSERT_FALSE(id_.empty());
   }
 
   void TearDown() {
-    IsolatedContext::GetInstance()->RevokeIsolatedFileSystem(id_);
+    IsolatedContext::GetInstance()->RemoveReference(id_);
   }
 
   IsolatedContext* isolated_context() const {
     return IsolatedContext::GetInstance();
   }
 
  protected:
   std::string id_;
   std::set<FilePath> fileset_;
 
@@ skipping 21 matching lines @@
     ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
         virtual_path, &cracked_id, &root_path, &cracked_path));
     ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(),
               cracked_path.value());
     ASSERT_TRUE(fileset_.find(root_path.NormalizePathSeparators())
                 != fileset_.end());
     ASSERT_EQ(id_, cracked_id);
   }
 
   // Revoking the current one and registering a new (empty) one.
-  isolated_context()->RevokeIsolatedFileSystem(id_);
+  isolated_context()->RemoveReference(id_);
   std::string id2 = isolated_context()->RegisterIsolatedFileSystem(
       std::set<FilePath>());
 
   // Make sure the GetTopLevelPaths returns true only for the new one.
   ASSERT_TRUE(isolated_context()->GetTopLevelPaths(id2, &toplevels));
   ASSERT_FALSE(isolated_context()->GetTopLevelPaths(id_, &toplevels));
 
-  isolated_context()->RevokeIsolatedFileSystem(id2);
+  isolated_context()->RemoveReference(id2);
 }
 
 TEST_F(IsolatedContextTest, CrackWithRelativePaths) {
   const struct {
     FilePath::StringType path;
     bool valid;
   } relatives[] = {
     { FPL("foo"), true },
     { FPL("foo/bar"), true },
     { FPL(".."), false },
@@ skipping 62 matching lines @@
   // Set writable.
   ASSERT_TRUE(isolated_context()->SetWritable(id_, true));
   ASSERT_TRUE(isolated_context()->IsWritable(id_));
 
   // Set non-writable.
   ASSERT_TRUE(isolated_context()->SetWritable(id_, false));
   ASSERT_FALSE(isolated_context()->IsWritable(id_));
 
   // Set writable again, and revoke the filesystem.
   ASSERT_TRUE(isolated_context()->SetWritable(id_, true));
-  isolated_context()->RevokeIsolatedFileSystem(id_);
+  isolated_context()->RemoveReference(id_);
 
   // IsWritable should return false for non-registered file system.
   ASSERT_FALSE(isolated_context()->IsWritable(id_));
   // SetWritable should also return false for non-registered file system
   // (no matter what value we give).
   ASSERT_FALSE(isolated_context()->SetWritable(id_, true));
   ASSERT_FALSE(isolated_context()->SetWritable(id_, false));
 }
 
 }  // namespace fileapi