Revert "Convert WebTestHostMsg_InitiateCaptureDump to Mojo"

This reverts commit ec6127ba.

Reason for revert: Caused flaky test failure on WebKit Linux Leak.

Original change's description:
> Convert WebTestHostMsg_InitiateCaptureDump to Mojo
> 
> This CL migrates the legacy InitiateCaptureDump IPC message
> to the new Mojo defined in WebTestClient interface.
> 
> Bug: 1039247
> Change-Id: Idd38ecf67d10593f3bfc6f3c48d9832514cec595
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032634
> Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
> Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
> Reviewed-by: Mike West <mkwst@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#739222}

TBR=dtapuska@chromium.org,mkwst@chromium.org,gyuyoung@igalia.com

Change-Id: Ie0bc76b7d3c8dd67481d67d0ee22b0338d87334f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1039247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2043531Reviewed-by: Gyuyoung Kim <gyuyoung@igalia.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#739357}

content/shell/browser/web_test/web_test_client_impl.cc

@@ -101,13 +101,4 @@ void WebTestClientImpl::ResetPermissions() {
       ->ResetPermissions();
 }
 
-void WebTestClientImpl::InitiateCaptureDump(bool capture_navigation_history,
-                                            bool capture_pixels) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (BlinkTestController::Get()) {
-    BlinkTestController::Get()->OnInitiateCaptureDump(
-        capture_navigation_history, capture_pixels);
-  }
-}
-
 }  // namespace content

content/shell/browser/web_test/web_test_client_impl.h

@@ -34,8 +34,6 @@ class WebTestClientImpl : public mojom::WebTestClient {
   void SimulateWebContentIndexDelete(const std::string& id) override;
   void BlockThirdPartyCookies(bool block) override;
   void ResetPermissions() override;
-  void InitiateCaptureDump(bool capture_navigation_history,
-                           bool capture_pixels) override;
 };
 
 }  // namespace content

content/shell/browser/web_test/web_test_message_filter.cc

@@ -78,6 +78,7 @@ WebTestMessageFilter::OverrideTaskRunnerForMessage(
     case WebTestHostMsg_SimulateWebNotificationClick::ID:
     case WebTestHostMsg_SetPermission::ID:
     case WebTestHostMsg_WebTestRuntimeFlagsChanged::ID:
+    case WebTestHostMsg_InitiateCaptureDump::ID:
     case WebTestHostMsg_DeleteAllCookies::ID:
     case WebTestHostMsg_GetWritableDirectory::ID:
     case WebTestHostMsg_SetFilePathForMockFileDialog::ID:
@@ -100,6 +101,8 @@ bool WebTestMessageFilter::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(WebTestHostMsg_SetPermission, OnSetPermission)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_WebTestRuntimeFlagsChanged,
                         OnWebTestRuntimeFlagsChanged)
+    IPC_MESSAGE_HANDLER(WebTestHostMsg_InitiateCaptureDump,
+                        OnInitiateCaptureDump)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_GetWritableDirectory,
                         OnGetWritableDirectory)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_SetFilePathForMockFileDialog,

content/shell/common/web_test.mojom

@@ -28,7 +28,4 @@ interface WebTestClient {
 
   // Reset all permissions of WebTestPermissionManager.
   ResetPermissions();
-
-  // Initialize to dump the main frame with a navigation history or pixels.
-  InitiateCaptureDump(bool capture_navigation_history, bool capture_pixels);
 };

content/shell/common/web_test/web_test_messages.h

@@ -38,6 +38,9 @@ IPC_MESSAGE_ROUTED4(WebTestHostMsg_SetPermission,
                     blink::mojom::PermissionStatus /* status */,
                     GURL /* origin */,
                     GURL /* embedding_origin */)
+IPC_MESSAGE_ROUTED2(WebTestHostMsg_InitiateCaptureDump,
+                    bool /* should dump navigation history */,
+                    bool /* should dump pixels */)
 
 IPC_SYNC_MESSAGE_ROUTED0_1(WebTestHostMsg_GetWritableDirectory,
                            base::FilePath /* local_path */)

content/shell/renderer/web_test/blink_test_runner.cc

@@ -464,9 +464,9 @@ void BlinkTestRunner::TestFinished() {
   if (interfaces->TestRunner()->ShouldDumpAsAudio()) {
     CaptureLocalAudioDump();
 
-    GetWebTestClientRemote().InitiateCaptureDump(
-        browser_should_dump_back_forward_list,
-        /*browser_should_capture_pixels=*/false);
+    Send(new WebTestHostMsg_InitiateCaptureDump(
+        routing_id(), browser_should_dump_back_forward_list,
+        /*browser_should_capture_pixels=*/false));
     return;
   }
 
@@ -477,9 +477,9 @@ void BlinkTestRunner::TestFinished() {
   CaptureLocalLayoutDump();
 
   if (!interfaces->TestRunner()->ShouldGeneratePixelResults()) {
-    GetWebTestClientRemote().InitiateCaptureDump(
-        browser_should_dump_back_forward_list,
-        /*browser_should_capture_pixels=*/false);
+    Send(new WebTestHostMsg_InitiateCaptureDump(
+        routing_id(), browser_should_dump_back_forward_list,
+        /*browser_should_capture_pixels=*/false));
     return;
   }
 
@@ -497,9 +497,9 @@ void BlinkTestRunner::TestFinished() {
           web_frame->GetSelectionBoundsRectForTesting();
     }
   }
-  GetWebTestClientRemote().InitiateCaptureDump(
-      browser_should_dump_back_forward_list,
-      !interfaces->TestRunner()->CanDumpPixelsFromRenderer());
+  Send(new WebTestHostMsg_InitiateCaptureDump(
+      routing_id(), browser_should_dump_back_forward_list,
+      !interfaces->TestRunner()->CanDumpPixelsFromRenderer()));
 }
 
 void BlinkTestRunner::CaptureLocalAudioDump() {