Worker: Remove WorkerLoaderProxy for clean-up

third_party/WebKit/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 30 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/ThreadableLoadingContext.h"
 #include "core/loader/WorkerFetchContext.h"
 #include "core/probe/CoreProbes.h"
 #include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerClients.h"
 #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"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/SubstituteData.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
@@ skipping 61 matching lines @@
   // Detach the client before closing the view to avoid getting called back.
   main_frame_->SetClient(0);
 
   if (worker_global_scope_proxy_) {
     worker_global_scope_proxy_->Detach();
     worker_global_scope_proxy_.Clear();
   }
 
   web_view_->Close();
   main_frame_->Close();
-  if (loader_proxy_)
-    loader_proxy_->DetachProvider(this);
 }
 
 void WebEmbeddedWorkerImpl::StartWorkerContext(
     const WebEmbeddedWorkerStartData& data) {
   DCHECK(!asked_to_terminate_);
   DCHECK(!main_script_loader_);
   DCHECK_EQ(pause_after_download_state_, kDontPauseAfterDownload);
   worker_start_data_ = data;
 
   // TODO(mkwst): This really needs to be piped through from the requesting
@@ skipping 114 matching lines @@
       ConsoleMessage::Create(
           kOtherMessageSource, web_core_message_level, message.text,
           SourceLocation::Create(message.url, message.line_number,
                                  message.column_number, nullptr)));
 }
 
 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.
   //
   // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader.
   // This code, and probably most of the code in this class should be shared
   // with SharedWorker.
   DCHECK(!web_view_);
   web_view_ = WebView::Create(nullptr, kWebPageVisibilityStateVisible);
   WebSettings* settings = web_view_->GetSettings();
@@ skipping 177 matching lines @@
           document->GetContentSecurityPolicy()->Headers().get(),
           main_script_loader_->GetReferrerPolicy(), starter_origin,
           worker_clients, main_script_loader_->ResponseAddressSpace(),
           main_script_loader_->OriginTrialTokens(), std::move(worker_settings),
           worker_v8_settings);
 
   main_script_loader_.Clear();
 
   worker_global_scope_proxy_ =
       ServiceWorkerGlobalScopeProxy::Create(*this, *worker_context_client_);
-  loader_proxy_ = WorkerLoaderProxy::Create(this);
-  worker_thread_ =
-      ServiceWorkerThread::Create(loader_proxy_, *worker_global_scope_proxy_);
+  worker_thread_ = WTF::MakeUnique<ServiceWorkerThread>(
+      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
   // populate the task runners with null document not to confuse the frame
   // scheduler (which will end up using the thread's default task runner).
   worker_thread_->Start(std::move(startup_data),
                         ParentFrameTaskRunners::Create(nullptr));
 
   worker_inspector_proxy_->WorkerThreadCreated(document, worker_thread_.get(),
                                                script_url);
 }
 
 }  // namespace blink