Convert WebTestHostMsg_BlockThirdPartyCookies to Mojo

This CL migrates the legacy BlockThirdPartyCookies IPC message
to the new Mojo defined in WebTestClient interface.

Bug: 1039247
Change-Id: I5b5bfce334dc1ebeb7139befbe0eb9422af2beb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032462
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@{#738861}

content/shell/browser/web_test/blink_test_controller.cc

@@ -804,8 +804,6 @@ bool BlinkTestController::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BlinkTestController, message)
     IPC_MESSAGE_HANDLER(BlinkTestHostMsg_PrintMessage, OnPrintMessage)
-    IPC_MESSAGE_HANDLER(WebTestHostMsg_BlockThirdPartyCookies,
-                        OnBlockThirdPartyCookies)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 

content/shell/browser/web_test/blink_test_controller.h

@@ -198,6 +198,7 @@ class BlinkTestController : public WebContentsObserver,
   void OnSetPopupBlockingEnabled(bool block_popups);
   void OnLoadURLForFrame(const GURL& url, const std::string& frame_name);
   void OnNavigateSecondaryWindow(const GURL& url);
+  void OnBlockThirdPartyCookies(bool block);
 
  private:
   enum TestPhase { BETWEEN_TESTS, DURING_TEST, CLEAN_UP };
@@ -232,7 +233,6 @@ class BlinkTestController : public WebContentsObserver,
   void OnTestFinished();
   void OnCaptureSessionHistory();
   void OnLeakDetectionDone(const LeakDetector::LeakDetectionReport& report);
-  void OnBlockThirdPartyCookies(bool block);
   mojo::AssociatedRemote<mojom::BlinkTestControl>& GetBlinkTestControlRemote(
       RenderFrameHost* frame);
   void HandleBlinkTestControlError(const GlobalFrameRoutingId& key);

content/shell/browser/web_test/web_test_client_impl.cc

@@ -88,4 +88,8 @@ void WebTestClientImpl::SimulateWebContentIndexDelete(const std::string& id) {
                              id);
 }
 
+void WebTestClientImpl::BlockThirdPartyCookies(bool block) {
+  BlinkTestController::Get()->OnBlockThirdPartyCookies(block);
+}
+
 }  // namespace content

content/shell/browser/web_test/web_test_client_impl.h

@@ -32,6 +32,7 @@ class WebTestClientImpl : public mojom::WebTestClient {
   void SimulateWebNotificationClose(const std::string& title,
                                     bool by_user) override;
   void SimulateWebContentIndexDelete(const std::string& id) override;
+  void BlockThirdPartyCookies(bool block) override;
 };
 
 }  // namespace content

content/shell/common/web_test.mojom

@@ -20,4 +20,9 @@ interface WebTestClient {
   //   - |title|: the title of the notification.
   //   - |by_user|: whether the user clicks the notification.
   SimulateWebNotificationClose(string title, bool by_user);
-};
+
\ No newline at end of file
+  // Sets the cookie policy to:
+  // - allow all cookies when |block| is false
+  // - block only third-party cookies when |block| is true
+  BlockThirdPartyCookies(bool block);
+};

content/shell/common/web_test/web_test_messages.h

@@ -32,7 +32,6 @@ IPC_MESSAGE_ROUTED3(WebTestHostMsg_SimulateWebNotificationClick,
                     std::string /* title */,
                     base::Optional<int> /* action_index */,
                     base::Optional<base::string16> /* reply */)
-IPC_MESSAGE_ROUTED1(WebTestHostMsg_BlockThirdPartyCookies, bool /* block */)
 IPC_MESSAGE_ROUTED0(WebTestHostMsg_DeleteAllCookies)
 IPC_MESSAGE_ROUTED4(WebTestHostMsg_SetPermission,
                     std::string /* name */,

content/shell/renderer/web_test/blink_test_runner.cc

@@ -378,7 +378,7 @@ void BlinkTestRunner::SetFocus(blink::WebView* web_view, bool focus) {
 }
 
 void BlinkTestRunner::SetBlockThirdPartyCookies(bool block) {
-  Send(new WebTestHostMsg_BlockThirdPartyCookies(routing_id(), block));
+  GetWebTestClientRemote().BlockThirdPartyCookies(block);
 }
 
 std::string BlinkTestRunner::PathToLocalResource(const std::string& resource) {