Remove WorkerScriptLoaderClient and inheritances

Source/core/workers/InProcessWorkerBase.cpp

 // Copyright 2015 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 "config.h"
 #include "core/workers/InProcessWorkerBase.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/events/MessageEvent.h"
 #include "core/fetch/ResourceFetcher.h"
@@ skipping 33 matching lines @@
 }
 
 bool InProcessWorkerBase::initialize(ExecutionContext* context, const String& url, ExceptionState& exceptionState)
 {
     suspendIfNeeded();
 
     KURL scriptURL = resolveURL(url, exceptionState);
     if (scriptURL.isEmpty())
         return false;
 
-    m_scriptLoader = WorkerScriptLoader::create();
-    m_scriptLoader->loadAsynchronously(*context, scriptURL, DenyCrossOriginRequests, this);
+    m_scriptLoader = adoptPtr(new WorkerScriptLoader());
+    m_scriptLoader->loadAsynchronously(
+        *context,
+        scriptURL,
+        DenyCrossOriginRequests,
+        bind(&InProcessWorkerBase::onResponse, this),
+        bind(&InProcessWorkerBase::onFinished, this));
 
     m_contextProxy = createWorkerGlobalScopeProxy(context);
 
     return true;
 }
 
 void InProcessWorkerBase::terminate()
 {
     if (m_contextProxy)
         m_contextProxy->terminateWorkerGlobalScope();
@@ skipping 10 matching lines @@
     return (m_contextProxy && m_contextProxy->hasPendingActivity()) || m_scriptLoader;
 }
 
 PassRefPtr<ContentSecurityPolicy> InProcessWorkerBase::contentSecurityPolicy()
 {
     if (m_scriptLoader)
         return m_scriptLoader->contentSecurityPolicy();
     return m_contentSecurityPolicy;
 }
 
-void InProcessWorkerBase::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
+void InProcessWorkerBase::onResponse()
 {
-    InspectorInstrumentation::didReceiveScriptResponse(executionContext(), identifier);
+    InspectorInstrumentation::didReceiveScriptResponse(executionContext(), m_scriptLoader->identifier());
 }
 
-void InProcessWorkerBase::notifyFinished()
+void InProcessWorkerBase::onFinished()
 {
     if (m_scriptLoader->failed()) {
         dispatchEvent(Event::createCancelable(EventTypeNames::error));
     } else {
         ASSERT(m_contextProxy);
         WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
         if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(executionContext()))
             startMode = PauseWorkerGlobalScopeOnStart;
         m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), executionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMode);
         InspectorInstrumentation::scriptImported(executionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());
     }
     m_contentSecurityPolicy = m_scriptLoader->releaseContentSecurityPolicy();
     m_scriptLoader = nullptr;
 }
 
 DEFINE_TRACE(InProcessWorkerBase)
 {
     AbstractWorker::trace(visitor);
 }
 
 } // namespace blink