Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/bindings/core/v8/V8ScriptRunnerTest.cpp

 // Copyright 2014 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 "bindings/core/v8/V8ScriptRunner.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/fetch/CachedMetadataHandler.h"
 #include "core/fetch/ScriptResource.h"
@@ skipping 55 matching lines @@
     {
         return !V8ScriptRunner::compileScript(
             v8String(isolate(), code()), filename(), String(), WTF::TextPosition(),
             isolate(), m_resource.get(), nullptr, m_resource.get() ? m_resource->cacheHandler(): nullptr, NotSharableCrossOrigin, cacheOptions)
             .IsEmpty();
     }
 
     void setEmptyResource()
     {
         m_resourceRequest = ResourceRequest();
-        m_resource = new ScriptResource(m_resourceRequest, "UTF-8");
+        m_resource = ScriptResource::create(m_resourceRequest, "UTF-8");
     }
 
     void setResource()
     {
         m_resourceRequest = ResourceRequest(url());
-        m_resource = new ScriptResource(m_resourceRequest, "UTF-8");
+        m_resource = ScriptResource::create(m_resourceRequest, "UTF-8");
     }
 
     CachedMetadataHandler* cacheHandler()
     {
         return m_resource->cacheHandler();
     }
 
 protected:
     ResourceRequest m_resourceRequest;
-    ResourcePtr<ScriptResource> m_resource;
+    RefPtrWillBePersistent<ScriptResource> m_resource;
     V8TestingScope m_scope;
 
     static int counter;
 };
 
 int V8ScriptRunnerTest::counter = 0;
 
 TEST_F(V8ScriptRunnerTest, resourcelessShouldPass)
 {
     EXPECT_TRUE(compileScript(V8CacheOptionsNone));
     EXPECT_TRUE(compileScript(V8CacheOptionsParse));
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
 }
 
 TEST_F(V8ScriptRunnerTest, emptyResourceDoesNotHaveCacheHandler)
 {
     setEmptyResource();
     EXPECT_FALSE(cacheHandler());
 }
 
 TEST_F(V8ScriptRunnerTest, parseOption)
 {
     setResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsParse));
     EXPECT_TRUE(cacheHandler()->cachedMetadata(tagForParserCache(cacheHandler())));
     EXPECT_FALSE(cacheHandler()->cachedMetadata(tagForCodeCache(cacheHandler())));
     // The cached data is associated with the encoding.
     ResourceRequest request(url());
-    ResourcePtr<ScriptResource> anotherResource = new ScriptResource(request, "UTF-16");
+    RefPtrWillBeRawPtr<ScriptResource> anotherResource = ScriptResource::create(request, "UTF-16");
     EXPECT_FALSE(cacheHandler()->cachedMetadata(tagForParserCache(anotherResource->cacheHandler())));
 }
 
 TEST_F(V8ScriptRunnerTest, codeOption)
 {
     setResource();
 
     // Compile twice, since 'code' has a probation period before it caches.
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
 
     EXPECT_FALSE(cacheHandler()->cachedMetadata(tagForParserCache(cacheHandler())));
     EXPECT_TRUE(cacheHandler()->cachedMetadata(tagForCodeCache(cacheHandler())));
     // The cached data is associated with the encoding.
     ResourceRequest request(url());
-    ResourcePtr<ScriptResource> anotherResource = new ScriptResource(request, "UTF-16");
+    RefPtrWillBeRawPtr<ScriptResource> anotherResource = ScriptResource::create(request, "UTF-16");
     EXPECT_FALSE(cacheHandler()->cachedMetadata(tagForCodeCache(anotherResource->cacheHandler())));
 }
 
 } // namespace
 
 } // namespace blink