Convert WebTestHostMsg_SimulateWebNotificationClick to Mojo

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

Mojo doesn't support base::Optional<int>. So, this CL passes
a value if it exists. It the value doesn't exist, a minimum
integer value is passed instead. Then, the handler function sets
the passed value to base::Optional<> again.

Bug: 1039247
Change-Id: I75850e1d642812c7e930a38e317b3eccda51e8ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2045270
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741092}

content/shell/browser/web_test/web_test_client_impl.cc

@@ -89,6 +89,19 @@ void WebTestClientImpl::TestFinishedInSecondaryRenderer() {
     BlinkTestController::Get()->OnTestFinishedInSecondaryRenderer();
 }
 
+void WebTestClientImpl::SimulateWebNotificationClick(
+    const std::string& title,
+    int32_t action_index,
+    const base::Optional<base::string16>& reply) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  GetMockPlatformNotificationService()->SimulateClick(
+      title,
+      action_index == std::numeric_limits<int32_t>::min()
+          ? base::Optional<int>()
+          : base::Optional<int>(action_index),
+      reply);
+}
+
 void WebTestClientImpl::SimulateWebNotificationClose(const std::string& title,
                                                      bool by_user) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);

content/shell/browser/web_test/web_test_client_impl.h

@@ -42,6 +42,10 @@ class WebTestClientImpl : public mojom::WebTestClient {
   // WebTestClient implementation.
   void InspectSecondaryWindow() override;
   void TestFinishedInSecondaryRenderer() override;
+  void SimulateWebNotificationClick(
+      const std::string& title,
+      int32_t action_index,
+      const base::Optional<base::string16>& reply) override;
   void SimulateWebNotificationClose(const std::string& title,
                                     bool by_user) override;
   void SimulateWebContentIndexDelete(const std::string& id) override;

content/shell/browser/web_test/web_test_message_filter.cc

@@ -35,18 +35,6 @@
 
 namespace content {
 
-namespace {
-
-MockPlatformNotificationService* GetMockPlatformNotificationService() {
-  auto* client = WebTestContentBrowserClient::Get();
-  auto* context = client->GetWebTestBrowserContext();
-  auto* service = client->GetPlatformNotificationService(context);
-
-  return static_cast<MockPlatformNotificationService*>(service);
-}
-
-}  // namespace
-
 WebTestMessageFilter::WebTestMessageFilter(
     int render_process_id,
     storage::DatabaseTracker* database_tracker,
@@ -70,7 +58,6 @@ WebTestMessageFilter::OverrideTaskRunnerForMessage(
   switch (message.type()) {
     case WebTestHostMsg_ClearAllDatabases::ID:
       return database_tracker_->task_runner();
-    case WebTestHostMsg_SimulateWebNotificationClick::ID:
     case WebTestHostMsg_InitiateCaptureDump::ID:
       return base::CreateSingleThreadTaskRunner({BrowserThread::UI});
   }
@@ -82,8 +69,6 @@ bool WebTestMessageFilter::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(WebTestMessageFilter, message)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_ClearAllDatabases, OnClearAllDatabases)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_SetDatabaseQuota, OnSetDatabaseQuota)
-    IPC_MESSAGE_HANDLER(WebTestHostMsg_SimulateWebNotificationClick,
-                        OnSimulateWebNotificationClick)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_InitiateCaptureDump,
                         OnInitiateCaptureDump)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -111,15 +96,6 @@ void WebTestMessageFilter::OnSetDatabaseQuota(int quota) {
   }
 }
 
-void WebTestMessageFilter::OnSimulateWebNotificationClick(
-    const std::string& title,
-    const base::Optional<int>& action_index,
-    const base::Optional<base::string16>& reply) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  GetMockPlatformNotificationService()->SimulateClick(title, action_index,
-                                                      reply);
-}
-
 void WebTestMessageFilter::OnInitiateCaptureDump(
     bool capture_navigation_history,
     bool capture_pixels) {

content/shell/browser/web_test/web_test_message_filter.h

@@ -10,8 +10,6 @@
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/optional.h"
-#include "base/strings/string16.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -44,10 +42,6 @@ class WebTestMessageFilter : public BrowserMessageFilter {
 
   void OnClearAllDatabases();
   void OnSetDatabaseQuota(int quota);
-  void OnSimulateWebNotificationClick(
-      const std::string& title,
-      const base::Optional<int>& action_index,
-      const base::Optional<base::string16>& reply);
   void OnInitiateCaptureDump(bool capture_navigation_history,
                              bool capture_pixels);
   void OnSetFilePathForMockFileDialog(const base::FilePath& path);

content/shell/common/web_test.mojom

@@ -6,6 +6,7 @@ module content.mojom;
 
 import "mojo/public/mojom/base/file_path.mojom";
 import "mojo/public/mojom/base/values.mojom";
+import "mojo/public/mojom/base/string16.mojom";
 import "third_party/blink/public/mojom/permissions/permission_status.mojom";
 import "url/mojom/url.mojom";
 
@@ -17,8 +18,12 @@ interface WebTestClient {
   // Sent by secondary test window to notify the test has finished.
   TestFinishedInSecondaryRenderer();
 
-  // Simulates a user deleting a content index entry.
-  SimulateWebContentIndexDelete(string id);
+  // Simulates a click on the notification.
+  //   - |title|: the title of the notification.
+  //   - |action_index|: indicates which action was clicked.
+  //   - |reply|: indicates the user reply.
+  SimulateWebNotificationClick(
+      string title, int32 action_index, mojo_base.mojom.String16? reply);
 
   // Simulates closing a titled web notification depending on the user
   // click.
@@ -26,6 +31,9 @@ interface WebTestClient {
   //   - |by_user|: whether the user clicks the notification.
   SimulateWebNotificationClose(string title, bool by_user);
 
+  // Simulates a user deleting a content index entry.
+  SimulateWebContentIndexDelete(string id);
+
   // Sets the cookie policy to:
   // - allow all cookies when |block| is false
   // - block only third-party cookies when |block| is true

content/shell/common/web_test/web_test_messages.h

@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/optional.h"
-#include "base/strings/string16.h"
 #include "content/public/common/common_param_traits_macros.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
@@ -21,10 +19,6 @@
 
 IPC_MESSAGE_ROUTED0(WebTestHostMsg_ClearAllDatabases)
 IPC_MESSAGE_ROUTED1(WebTestHostMsg_SetDatabaseQuota, int /* quota */)
-IPC_MESSAGE_ROUTED3(WebTestHostMsg_SimulateWebNotificationClick,
-                    std::string /* title */,
-                    base::Optional<int> /* action_index */,
-                    base::Optional<base::string16> /* reply */)
 IPC_MESSAGE_ROUTED2(WebTestHostMsg_InitiateCaptureDump,
                     bool /* should dump navigation history */,
                     bool /* should dump pixels */)

content/shell/renderer/web_test/blink_test_runner.cc

@@ -290,8 +290,8 @@ void BlinkTestRunner::SimulateWebNotificationClick(
     const std::string& title,
     const base::Optional<int>& action_index,
     const base::Optional<base::string16>& reply) {
-  Send(new WebTestHostMsg_SimulateWebNotificationClick(routing_id(), title,
-                                                       action_index, reply));
+  GetWebTestClientRemote().SimulateWebNotificationClick(
+      title, action_index.value_or(std::numeric_limits<int32_t>::min()), reply);
 }
 
 void BlinkTestRunner::SimulateWebNotificationClose(const std::string& title,