Remove |pause_after_download_| from WebEmbeddedWorkerImpl

This field is no longer used. Bug: 999907 Change-Id: I981225e9e966aefa4164723d9e968068d1bb091f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1781001 Commit-Queue: Kenichi Ishibashi <bashi@chromium.org> Reviewed-by: Matt Falkenhagen <falken@chromium.org> Cr-Commit-Position: refs/heads/master@{#692547}
Denger-Network · Sep 3, 2019 · a082dcf · a082dcf
1 parent 3af90f7
commit a082dcf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 30 deletions.
diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.cc b/content/renderer/service_worker/embedded_worker_instance_client_impl.cc
@@ -170,10 +170,6 @@ EmbeddedWorkerInstanceClientImpl::BuildStartData(
   start_data.devtools_worker_token = params.devtools_worker_token;
   start_data.v8_cache_options =
       static_cast<blink::WebSettings::V8CacheOptions>(params.v8_cache_options);
-  start_data.pause_after_download_mode =
-      params.pause_after_download
-          ? blink::WebEmbeddedWorkerStartData::kPauseAfterDownload
-          : blink::WebEmbeddedWorkerStartData::kDontPauseAfterDownload;
   start_data.privacy_preferences = blink::PrivacyPreferences(
       params.renderer_preferences->enable_do_not_track,
       params.renderer_preferences->enable_referrers);

diff --git a/third_party/blink/public/web/web_embedded_worker_start_data.h b/third_party/blink/public/web/web_embedded_worker_start_data.h
@@ -43,16 +43,11 @@
 namespace blink {
 
 struct WebEmbeddedWorkerStartData {
-  enum PauseAfterDownloadMode {
-    kDontPauseAfterDownload,
-    kPauseAfterDownload,
-  };
   enum WaitForDebuggerMode { kDontWaitForDebugger, kWaitForDebugger };
 
   WebURL script_url;
   WebString user_agent;
   mojom::ScriptType script_type;
-  PauseAfterDownloadMode pause_after_download_mode;
   // Whether to pause the initialization and wait for debugger to attach
   // before proceeding. This technique allows debugging worker startup.
   WaitForDebuggerMode wait_for_debugger_mode;
@@ -66,8 +61,7 @@ struct WebEmbeddedWorkerStartData {
   PrivacyPreferences privacy_preferences;
 
   WebEmbeddedWorkerStartData()
-      : pause_after_download_mode(kDontPauseAfterDownload),
-        wait_for_debugger_mode(kDontWaitForDebugger),
+      : wait_for_debugger_mode(kDontWaitForDebugger),
         v8_cache_options(WebSettings::V8CacheOptions::kDefault) {}
 };
 

diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
@@ -125,7 +125,6 @@ WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(
         browser_interface_broker)
     : worker_context_client_(client),
       content_settings_client_(std::move(content_settings_client)),
-      pause_after_download_state_(kDontPauseAfterDownload),
       cache_storage_remote_(std::move(cache_storage_remote)),
       interface_provider_info_(std::move(interface_provider_info)),
       browser_interface_broker_(std::move(browser_interface_broker)) {
@@ -159,7 +158,6 @@ void WebEmbeddedWorkerImpl::StartWorkerContext(
     const WebEmbeddedWorkerStartData& data,
     scoped_refptr<base::SingleThreadTaskRunner> initiator_thread_task_runner) {
   DCHECK(!asked_to_terminate_);
-  DCHECK_EQ(pause_after_download_state_, kDontPauseAfterDownload);
   worker_start_data_ = data;
 
   // TODO(mkwst): This really needs to be piped through from the requesting
@@ -177,10 +175,6 @@ void WebEmbeddedWorkerImpl::StartWorkerContext(
   if (SecurityOrigin::Create(script_url)->IsLocalhost())
     worker_start_data_.address_space = network::mojom::IPAddressSpace::kLocal;
 
-  if (data.pause_after_download_mode ==
-      WebEmbeddedWorkerStartData::kPauseAfterDownload)
-    pause_after_download_state_ = kDoPauseAfterDownload;
-
   devtools_worker_token_ = data.devtools_worker_token;
   wait_for_debugger_mode_ = worker_start_data_.wait_for_debugger_mode;
   StartWorkerThread(std::move(initiator_thread_task_runner));
@@ -192,10 +186,9 @@ void WebEmbeddedWorkerImpl::TerminateWorkerContext() {
   asked_to_terminate_ = true;
   if (!worker_thread_) {
     // The worker thread has not been created yet if the worker is asked to
-    // terminate during waiting for debugger or paused after download.
-    DCHECK(worker_start_data_.wait_for_debugger_mode ==
-               WebEmbeddedWorkerStartData::kWaitForDebugger ||
-           pause_after_download_state_ == kIsPausedAfterDownload);
+    // terminate during waiting for debugger.
+    DCHECK_EQ(WebEmbeddedWorkerStartData::kWaitForDebugger,
+              worker_start_data_.wait_for_debugger_mode);
     // This deletes 'this'.
     worker_context_client_->WorkerContextFailedToStartOnInitiatorThread();
     return;

diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.h b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.h
@@ -106,13 +106,6 @@ class MODULES_EXPORT WebEmbeddedWorkerImpl final : public WebEmbeddedWorker {
 
   bool asked_to_terminate_ = false;
 
-  // TODO(bashi): Remove. This is no longer used.
-  enum {
-    kDontPauseAfterDownload,
-    kDoPauseAfterDownload,
-    kIsPausedAfterDownload
-  } pause_after_download_state_;
-
   // Unique worker token used by DevTools to attribute different instrumentation
   // to the same worker.
   base::UnguessableToken devtools_worker_token_;

diff --git a/third_party/blink/renderer/modules/service_worker/web_embedded_worker_impl_test.cc b/third_party/blink/renderer/modules/service_worker/web_embedded_worker_impl_test.cc
@@ -241,8 +241,6 @@ class WebEmbeddedWorkerImplTest : public testing::Test {
     start_data_.script_url = script_url;
     start_data_.user_agent = WebString("dummy user agent");
     start_data_.script_type = mojom::ScriptType::kClassic;
-    start_data_.pause_after_download_mode =
-        WebEmbeddedWorkerStartData::kDontPauseAfterDownload;
     start_data_.wait_for_debugger_mode =
         WebEmbeddedWorkerStartData::kDontWaitForDebugger;
     start_data_.v8_cache_options = WebSettings::V8CacheOptions::kDefault;