Remove WorkerScriptLoaderClient and inheritances

Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/WorkerDebuggerAgent.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerInspectorProxy.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
-#include "core/workers/WorkerScriptLoaderClient.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/SharedBuffer.h"
 #include "platform/heap/Handle.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebServiceWorkerProvider.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/web/WebDevToolsAgent.h"
 #include "public/web/WebServiceWorkerContextClient.h"
 #include "public/web/WebServiceWorkerNetworkProvider.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "public/web/WebWorkerContentSettingsClientProxy.h"
 #include "web/ServiceWorkerGlobalScopeClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeProxy.h"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WorkerContentSettingsClient.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
-// A thin wrapper for one-off script loading.
-class WebEmbeddedWorkerImpl::Loader : public WorkerScriptLoaderClient {
-public:
-    static PassOwnPtr<Loader> create()
-    {
-        return adoptPtr(new Loader());
-    }
-
-    virtual ~Loader()
-    {
-        m_scriptLoader->setClient(0);
-    }
-
-    void load(ExecutionContext* loadingContext, const KURL& scriptURL, PassOwnPtr<Closure> callback)
-    {
-        ASSERT(loadingContext);
-        m_callback = callback;
-        m_scriptLoader->setRequestContext(WebURLRequest::RequestContextServiceWorker);
-        m_scriptLoader->loadAsynchronously(
-            *loadingContext, scriptURL, DenyCrossOriginRequests, this);
-    }
-
-    virtual void notifyFinished() override
-    {
-        (*m_callback)();
-    }
-
-    void cancel()
-    {
-        m_scriptLoader->cancel();
-    }
-
-    bool failed() const { return m_scriptLoader->failed(); }
-    const KURL& url() const { return m_scriptLoader->responseURL(); }
-    String script() const { return m_scriptLoader->script(); }
-    const Vector<char>* cachedMetadata() const { return m_scriptLoader->cachedMetadata(); }
-    PassOwnPtr<Vector<char>> releaseCachedMetadata() const { return m_scriptLoader->releaseCachedMetadata(); }
-    PassRefPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_scriptLoader->releaseContentSecurityPolicy(); }
-
-private:
-    Loader() : m_scriptLoader(WorkerScriptLoader::create())
-    {
-    }
-
-    RefPtr<WorkerScriptLoader> m_scriptLoader;
-    OwnPtr<Closure> m_callback;
-};
-
 WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerContentSettingsClientProxy* contentSettingsClient)
 {
     return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(contentSettingsClient));
 }
 
 static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
 {
     DEFINE_STATIC_LOCAL(HashSet<WebEmbeddedWorkerImpl*>, set, ());
     return set;
 }
@@ skipping 208 matching lines @@
 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame)
 {
     ASSERT(!m_mainScriptLoader);
     ASSERT(!m_networkProvider);
     ASSERT(m_mainFrame);
     ASSERT(m_workerContextClient);
     ASSERT(m_loadingShadowPage);
     ASSERT(!m_askedToTerminate);
     m_loadingShadowPage = false;
     m_networkProvider = adoptPtr(m_workerContextClient->createServiceWorkerNetworkProvider(frame->dataSource()));
-    m_mainScriptLoader = Loader::create();
-    m_mainScriptLoader->load(
-        m_mainFrame->frame()->document(),
+    m_mainScriptLoader = adoptPtr(new WorkerScriptLoader());
+    m_mainScriptLoader->setRequestContext(WebURLRequest::RequestContextServiceWorker);
+    m_mainScriptLoader->loadAsynchronously(
+        *m_mainFrame->frame()->document(),
         m_workerStartData.scriptURL,
+        DenyCrossOriginRequests,
+        nullptr,
         bind(&WebEmbeddedWorkerImpl::onScriptLoaderFinished, this));
 }
 
 void WebEmbeddedWorkerImpl::sendProtocolMessage(int callId, const WebString& message, const WebString& state)
 {
     m_workerContextClient->sendDevToolsMessage(callId, message, state);
 }
 
 void WebEmbeddedWorkerImpl::resumeStartup()
 {
@@ skipping 68 matching lines @@
     m_mainScriptLoader.clear();
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
     m_loaderProxy = WorkerLoaderProxy::create(this);
     m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
     m_workerThread->start(startupData.release());
     m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
 }
 
 } // namespace blink