Remove WorkerScriptLoaderClient and inheritances

Source/web/WebEmbeddedWorkerImpl.h

 /*
  * 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 28 matching lines @@
 #include "public/web/WebEmbeddedWorkerStartData.h"
 #include "public/web/WebFrameClient.h"
 
 namespace blink {
 
 class ServiceWorkerGlobalScopeProxy;
 class WebLocalFrameImpl;
 class WebServiceWorkerNetworkProvider;
 class WebView;
 class WorkerInspectorProxy;
+class WorkerScriptLoader;
 class WorkerThread;
 
 class WebEmbeddedWorkerImpl final
     : public WebEmbeddedWorker
     , public WebFrameClient
     , public WebDevToolsAgentClient
     , private WorkerLoaderProxyProvider {
     WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl);
 public:
     WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient>, PassOwnPtr<WebWorkerContentSettingsClientProxy>);
-    virtual ~WebEmbeddedWorkerImpl();
+    ~WebEmbeddedWorkerImpl() override;
 
     // Terminate all WebEmbeddedWorkerImpl for testing purposes.
     // Note that this only schedules termination and
     // does not synchronously wait for it to complete.
     static void terminateAll();
 
     // WebEmbeddedWorker overrides.
-    virtual void startWorkerContext(const WebEmbeddedWorkerStartData&) override;
-    virtual void resumeAfterDownload() override;
-    virtual void terminateWorkerContext() override;
-    virtual void attachDevTools(const WebString& hostId) override;
-    virtual void reattachDevTools(const WebString& hostId, const WebString& savedState) override;
-    virtual void detachDevTools() override;
-    virtual void dispatchDevToolsMessage(const WebString&) override;
+    void startWorkerContext(const WebEmbeddedWorkerStartData&) override;
+    void resumeAfterDownload() override;
+    void terminateWorkerContext() override;
+    void attachDevTools(const WebString& hostId) override;
+    void reattachDevTools(const WebString& hostId, const WebString& savedState) override;
+    void detachDevTools() override;
+    void dispatchDevToolsMessage(const WebString&) override;
 
     void postMessageToPageInspector(const WTF::String&);
 
 private:
-    class Loader;
-
     void prepareShadowPageForLoader();
     void loadShadowPage();
 
     // WebFrameClient overrides.
-    virtual void willSendRequest(
+    void willSendRequest(
         WebLocalFrame*, unsigned identifier, WebURLRequest&,
         const WebURLResponse& redirectResponse) override;
-    virtual void didFinishDocumentLoad(WebLocalFrame*) override;
+    void didFinishDocumentLoad(WebLocalFrame*) override;
 
     // WebDevToolsAgentClient overrides.
-    virtual void sendProtocolMessage(int callId, const WebString&, const WebString&) override;
-    virtual void resumeStartup() override;
+    void sendProtocolMessage(int callId, const WebString&, const WebString&) override;
+    void resumeStartup() override;
 
     void onScriptLoaderFinished();
     void startWorkerThread();
 
     // WorkerLoaderProxyProvider
-    virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
-    virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override;
+    void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
+    bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override;
 
     WebEmbeddedWorkerStartData m_workerStartData;
 
     OwnPtr<WebServiceWorkerContextClient> m_workerContextClient;
 
     // This is kept until startWorkerContext is called, and then passed on
     // to WorkerContext.
     OwnPtr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
 
     // We retain ownership of this one which is for use on the
     // main thread only.
     OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
 
     // Kept around only while main script loading is ongoing.
-    OwnPtr<Loader> m_mainScriptLoader;
+    OwnPtr<WorkerScriptLoader> m_mainScriptLoader;
 
     RefPtr<WorkerThread> m_workerThread;
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
     OwnPtr<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
     OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy;
 
     // 'shadow page' - created to proxy loading requests from the worker.
     // Both WebView and WebFrame objects are close()'ed (where they're
     // deref'ed) when this EmbeddedWorkerImpl is destructed, therefore they
     // are guaranteed to exist while this object is around.
@@ skipping 14 matching lines @@
         DoPauseAfterDownload,
         IsPausedAfterDownload
     } m_pauseAfterDownloadState;
 
     WaitingForDebuggerState m_waitingForDebuggerState;
 };
 
 } // namespace blink
 
 #endif // WebEmbeddedWorkerImpl_h