Worker: Remove WorkerLoaderProxy for clean-up

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
index 1b4d6eb2324f29d5f3f4af7e1e5f16dc3a176f0b..b2668fbc4c1090f31de81e99655bbc98458c398d 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -45,7 +45,6 @@
 #include "core/workers/WorkerContentSettingsClient.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerInspectorProxy.h"
-#include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
@@ -127,8 +126,6 @@ WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl() {
 
   web_view_->Close();
   main_frame_->Close();
-  if (loader_proxy_)
-    loader_proxy_->DetachProvider(this);
 }
 
 void WebEmbeddedWorkerImpl::StartWorkerContext(
@@ -263,14 +260,6 @@ void WebEmbeddedWorkerImpl::PostMessageToPageInspector(const String& message) {
   worker_inspector_proxy_->DispatchMessageFromWorker(message);
 }
 
-ThreadableLoadingContext* WebEmbeddedWorkerImpl::GetThreadableLoadingContext() {
-  if (!loading_context_) {
-    loading_context_ = ThreadableLoadingContext::Create(
-        *main_frame_->GetFrame()->GetDocument());
-  }
-  return loading_context_;
-}
-
 void WebEmbeddedWorkerImpl::PrepareShadowPageForLoader() {
   // Create 'shadow page', which is never displayed and is used mainly to
   // provide a context for loading on the main thread.
@@ -453,9 +442,8 @@ void WebEmbeddedWorkerImpl::StartWorkerThread() {
 
   worker_global_scope_proxy_ = ServiceWorkerGlobalScopeProxy::Create(
       *this, *document, *worker_context_client_);
-  loader_proxy_ = WorkerLoaderProxy::Create(this);
-  worker_thread_ =
-      ServiceWorkerThread::Create(loader_proxy_, *worker_global_scope_proxy_);
+  worker_thread_ = ServiceWorkerThread::Create(
+      ThreadableLoadingContext::Create(*document), *worker_global_scope_proxy_);
 
   // We have a dummy document here for loading but it doesn't really represent
   // the document/frame of associated document(s) for this worker. Here we