Revert of Move ThreadableLoader to Oilpan heap (2/3)

third_party/WebKit/Source/modules/fetch/FetchManager.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 "modules/fetch/FetchManager.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
@@ skipping 151 matching lines @@
     void performHTTPFetch(bool corsFlag, bool corsPreflightFlag);
     void performDataFetch();
     void failed(const String& message);
     void notifyFinished();
     Document* document() const;
     void loadSucceeded();
 
     Member<FetchManager> m_fetchManager;
     Member<ScriptPromiseResolver> m_resolver;
     Member<FetchRequestData> m_request;
-    Member<ThreadableLoader> m_loader;
+    std::unique_ptr<ThreadableLoader> m_loader;
     bool m_failed;
     bool m_finished;
     int m_responseHttpStatusCode;
     Member<SRIVerifier> m_integrityVerifier;
     bool m_didFinishLoading;
     bool m_isIsolatedWorld;
     Member<ExecutionContext> m_executionContext;
 };
 
 FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, ScriptPromiseResolver* resolver, FetchRequestData* request, bool isIsolatedWorld)
@@ skipping 14 matching lines @@
 FetchManager::Loader::~Loader()
 {
     ASSERT(!m_loader);
 }
 
 DEFINE_TRACE(FetchManager::Loader)
 {
     visitor->trace(m_fetchManager);
     visitor->trace(m_resolver);
     visitor->trace(m_request);
-    visitor->trace(m_loader);
     visitor->trace(m_integrityVerifier);
     visitor->trace(m_executionContext);
 }
 
 void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle)
 {
     ASSERT(handle);
     ScriptState* scriptState = m_resolver->getScriptState();
     ScriptState::Scope scope(scriptState);
 
@@ skipping 300 matching lines @@
     // |CORS flag| set."
     performHTTPFetch(true, false);
 }
 
 void FetchManager::Loader::dispose()
 {
     // Prevent notification
     m_fetchManager = nullptr;
     if (m_loader) {
         m_loader->cancel();
-        m_loader = nullptr;
+        m_loader.reset();
     }
     m_executionContext = nullptr;
 }
 
 void FetchManager::Loader::performBasicFetch()
 {
     // "To perform a basic fetch using |request|, switch on |request|'s url's
     // scheme, and run the associated steps:"
     if (SchemeRegistry::shouldTreatURLSchemeAsSupportingFetchAPI(m_request->url().protocol())) {
         // "Return the result of performing an HTTP fetch using |request|."
@@ skipping 203 matching lines @@
     loader->dispose();
 }
 
 DEFINE_TRACE(FetchManager)
 {
     visitor->trace(m_loaders);
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink