Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.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/ScriptStreamer.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/ScriptStreamerThread.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 14 matching lines @@
 
 namespace {
 
 class ScriptStreamingTest : public ::testing::Test {
 public:
     ScriptStreamingTest()
         : m_loadingTaskRunner(Platform::current()->currentThread()->scheduler()->loadingTaskRunner())
         , m_scope(v8::Isolate::GetCurrent())
         , m_settings(Settings::create())
         , m_resourceRequest("http://www.streaming-test.com/")
-        , m_resource(new ScriptResource(m_resourceRequest, "UTF-8"))
+        , m_resource(ScriptResource::create(m_resourceRequest, "UTF-8"))
         , m_pendingScript(PendingScript::create(0, m_resource.get()))
     {
         m_resource->setLoading(true);
         m_pendingScript = PendingScript::create(0, m_resource.get());
         ScriptStreamer::setSmallScriptThresholdForTesting(0);
     }
 
     ScriptState* scriptState() const { return m_scope.scriptState(); }
     v8::Isolate* isolate() const { return m_scope.isolate(); }
 
@@ skipping 36 matching lines @@
         testing::runPendingTasks();
     }
 
     WebTaskRunner* m_loadingTaskRunner; // NOT OWNED
     V8TestingScope m_scope;
     OwnPtr<Settings> m_settings;
     // The Resource and PendingScript where we stream from. These don't really
     // fetch any data outside the test; the test controls the data by calling
     // ScriptResource::appendData.
     ResourceRequest m_resourceRequest;
-    ResourcePtr<ScriptResource> m_resource;
+    RefPtrWillBePersistent<ScriptResource> m_resource;
     OwnPtrWillBePersistent<PendingScript> m_pendingScript;
 };
 
 class TestScriptResourceClient : public ScriptResourceClient {
 public:
     TestScriptResourceClient()
         : m_finished(false) { }
 
     void notifyFinished(Resource*) override { m_finished = true; }
     String debugName() const override { return "TestScriptResourceClient"; }
@@ skipping 81 matching lines @@
     pendingScript()->watchForLoad(&client);
     appendData("function foo() {");
 
     // In general, we cannot control what the background thread is doing
     // (whether it's parsing or waiting for more data). In this test, we have
     // given it so little data that it's surely waiting for more.
 
     // Simulate cancelling the network load (e.g., because the user navigated
     // away).
     EXPECT_FALSE(client.finished());
-    pendingScript()->stopWatchingForLoad(&client);
+    pendingScript()->stopWatchingForLoad();
     pendingScript()->releaseElementAndClear();
     m_pendingScript = nullptr; // This will destroy m_resource.
-    m_resource = 0;
+    m_resource = nullptr;
 
     // The V8 side will complete too. This should not crash. We don't receive
     // any results from the streaming and the client doesn't get notified.
     processTasksUntilStreamingComplete();
     EXPECT_FALSE(client.finished());
 }
 
 TEST_F(ScriptStreamingTest, SuppressingStreaming)
 {
     // If we notice during streaming that there is a code cache, streaming
@@ skipping 168 matching lines @@
     EXPECT_TRUE(sourceCode.streamer());
     v8::TryCatch tryCatch(isolate());
     v8::Local<v8::Script> script;
     EXPECT_TRUE(V8ScriptRunner::compileScript(sourceCode, isolate()).ToLocal(&script));
     EXPECT_FALSE(tryCatch.HasCaught());
 }
 
 } // namespace
 
 } // namespace blink