Worker: Remove WorkerLoaderProxy for clean-up

third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h

Index: third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h
diff --git a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h
index ed21b16a9ac067aed4eec52b8a1ec64c7a23cec4..30837e6bacac038d9e2e32162c0b65c9abfe9cd9 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h
+++ b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h
@@ -9,20 +9,18 @@
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleTypes.h"
 #include "core/workers/ParentFrameTaskRunners.h"
-#include "core/workers/WorkerLoaderProxy.h"
 #include "platform/wtf/Forward.h"
 
 namespace blink {
 
 class ExecutionContext;
 class SourceLocation;
+class ThreadableLoadingContext;
 class WorkerInspectorProxy;
-class WorkerLoaderProxy;
 class WorkerThread;
 class WorkerThreadStartupData;
 
-class CORE_EXPORT ThreadedMessagingProxyBase
-    : private WorkerLoaderProxyProvider {
+class CORE_EXPORT ThreadedMessagingProxyBase {
  public:
   void TerminateGlobalScope();
 
@@ -61,7 +59,7 @@ class CORE_EXPORT ThreadedMessagingProxyBase
 
  protected:
   ThreadedMessagingProxyBase(ExecutionContext*);
-  ~ThreadedMessagingProxyBase() override;
+  virtual ~ThreadedMessagingProxyBase();
 
   void InitializeWorkerThread(std::unique_ptr<WorkerThreadStartupData>);
   virtual std::unique_ptr<WorkerThread> CreateWorkerThread(
@@ -71,7 +69,6 @@ class CORE_EXPORT ThreadedMessagingProxyBase
 
   bool AskedToTerminate() const { return asked_to_terminate_; }
 
-  PassRefPtr<WorkerLoaderProxy> LoaderProxy() { return loader_proxy_; }
   WorkerInspectorProxy* GetWorkerInspectorProxy() const {
     return worker_inspector_proxy_.Get();
   }
@@ -79,8 +76,7 @@ class CORE_EXPORT ThreadedMessagingProxyBase
   // Returns true if this is called on the parent context thread.
   bool IsParentContextThread() const;
 
-  // WorkerLoaderProxyProvider
-  ThreadableLoadingContext* GetThreadableLoadingContext() override;
+  ThreadableLoadingContext* GetThreadableLoadingContext();
 
  private:
   friend class InProcessWorkerMessagingProxyForTest;
@@ -89,15 +85,12 @@ class CORE_EXPORT ThreadedMessagingProxyBase
   void ParentObjectDestroyedInternal();
 
   Persistent<ExecutionContext> execution_context_;
-  Persistent<ThreadableLoadingContext> loading_context_;
   Persistent<WorkerInspectorProxy> worker_inspector_proxy_;
   // Accessed cross-thread when worker thread posts tasks to the parent.
   CrossThreadPersistent<ParentFrameTaskRunners> parent_frame_task_runners_;
 
   std::unique_ptr<WorkerThread> worker_thread_;
 
-  RefPtr<WorkerLoaderProxy> loader_proxy_;
-
   bool may_be_destroyed_;
   bool asked_to_terminate_;
 };