Convert WebTestHostMsg_SetPermission to Mojo

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

Bug: 1039247
Change-Id: If6534315b0d1c66dea500c29a17f3ff2d515634d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037178
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739396}

content/shell/browser/web_test/web_test_client_impl.cc

@@ -101,4 +101,55 @@ void WebTestClientImpl::ResetPermissions() {
       ->ResetPermissions();
 }
 
+void WebTestClientImpl::SetPermission(const std::string& name,
+                                      blink::mojom::PermissionStatus status,
+                                      const GURL& origin,
+                                      const GURL& embedding_origin) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  content::PermissionType type;
+  if (name == "midi") {
+    type = PermissionType::MIDI;
+  } else if (name == "midi-sysex") {
+    type = PermissionType::MIDI_SYSEX;
+  } else if (name == "push-messaging" || name == "notifications") {
+    type = PermissionType::NOTIFICATIONS;
+  } else if (name == "geolocation") {
+    type = PermissionType::GEOLOCATION;
+  } else if (name == "protected-media-identifier") {
+    type = PermissionType::PROTECTED_MEDIA_IDENTIFIER;
+  } else if (name == "background-sync") {
+    type = PermissionType::BACKGROUND_SYNC;
+  } else if (name == "accessibility-events") {
+    type = PermissionType::ACCESSIBILITY_EVENTS;
+  } else if (name == "clipboard-read-write") {
+    type = PermissionType::CLIPBOARD_READ_WRITE;
+  } else if (name == "clipboard-sanitized-write") {
+    type = PermissionType::CLIPBOARD_SANITIZED_WRITE;
+  } else if (name == "payment-handler") {
+    type = PermissionType::PAYMENT_HANDLER;
+  } else if (name == "accelerometer" || name == "gyroscope" ||
+             name == "magnetometer" || name == "ambient-light-sensor") {
+    type = PermissionType::SENSORS;
+  } else if (name == "background-fetch") {
+    type = PermissionType::BACKGROUND_FETCH;
+  } else if (name == "periodic-background-sync") {
+    type = PermissionType::PERIODIC_BACKGROUND_SYNC;
+  } else if (name == "wake-lock-screen") {
+    type = PermissionType::WAKE_LOCK_SCREEN;
+  } else if (name == "wake-lock-system") {
+    type = PermissionType::WAKE_LOCK_SYSTEM;
+  } else if (name == "nfc") {
+    type = PermissionType::NFC;
+  } else {
+    NOTREACHED();
+    type = PermissionType::NOTIFICATIONS;
+  }
+
+  WebTestContentBrowserClient::Get()
+      ->GetWebTestBrowserContext()
+      ->GetWebTestPermissionManager()
+      ->SetPermission(type, status, origin, embedding_origin);
+}
+
 }  // namespace content

content/shell/browser/web_test/web_test_client_impl.h

@@ -34,6 +34,10 @@ class WebTestClientImpl : public mojom::WebTestClient {
   void SimulateWebContentIndexDelete(const std::string& id) override;
   void BlockThirdPartyCookies(bool block) override;
   void ResetPermissions() override;
+  void SetPermission(const std::string& name,
+                     blink::mojom::PermissionStatus status,
+                     const GURL& origin,
+                     const GURL& embedding_origin) override;
 };
 
 }  // namespace content

content/shell/browser/web_test/web_test_message_filter.cc

@@ -76,7 +76,6 @@ WebTestMessageFilter::OverrideTaskRunnerForMessage(
     case WebTestHostMsg_ClearAllDatabases::ID:
       return database_tracker_->task_runner();
     case WebTestHostMsg_SimulateWebNotificationClick::ID:
-    case WebTestHostMsg_SetPermission::ID:
     case WebTestHostMsg_WebTestRuntimeFlagsChanged::ID:
     case WebTestHostMsg_InitiateCaptureDump::ID:
     case WebTestHostMsg_DeleteAllCookies::ID:
@@ -98,7 +97,6 @@ bool WebTestMessageFilter::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(WebTestHostMsg_SimulateWebNotificationClick,
                         OnSimulateWebNotificationClick)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_DeleteAllCookies, OnDeleteAllCookies)
-    IPC_MESSAGE_HANDLER(WebTestHostMsg_SetPermission, OnSetPermission)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_WebTestRuntimeFlagsChanged,
                         OnWebTestRuntimeFlagsChanged)
     IPC_MESSAGE_HANDLER(WebTestHostMsg_InitiateCaptureDump,
@@ -169,58 +167,6 @@ void WebTestMessageFilter::OnDeleteAllCookies() {
                                  base::BindOnce([](uint32_t) {}));
 }
 
-void WebTestMessageFilter::OnSetPermission(
-    const std::string& name,
-    blink::mojom::PermissionStatus status,
-    const GURL& origin,
-    const GURL& embedding_origin) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  content::PermissionType type;
-  if (name == "midi") {
-    type = PermissionType::MIDI;
-  } else if (name == "midi-sysex") {
-    type = PermissionType::MIDI_SYSEX;
-  } else if (name == "push-messaging" || name == "notifications") {
-    type = PermissionType::NOTIFICATIONS;
-  } else if (name == "geolocation") {
-    type = PermissionType::GEOLOCATION;
-  } else if (name == "protected-media-identifier") {
-    type = PermissionType::PROTECTED_MEDIA_IDENTIFIER;
-  } else if (name == "background-sync") {
-    type = PermissionType::BACKGROUND_SYNC;
-  } else if (name == "accessibility-events") {
-    type = PermissionType::ACCESSIBILITY_EVENTS;
-  } else if (name == "clipboard-read-write") {
-    type = PermissionType::CLIPBOARD_READ_WRITE;
-  } else if (name == "clipboard-sanitized-write") {
-    type = PermissionType::CLIPBOARD_SANITIZED_WRITE;
-  } else if (name == "payment-handler") {
-    type = PermissionType::PAYMENT_HANDLER;
-  } else if (name == "accelerometer" || name == "gyroscope" ||
-             name == "magnetometer" || name == "ambient-light-sensor") {
-    type = PermissionType::SENSORS;
-  } else if (name == "background-fetch") {
-    type = PermissionType::BACKGROUND_FETCH;
-  } else if (name == "periodic-background-sync") {
-    type = PermissionType::PERIODIC_BACKGROUND_SYNC;
-  } else if (name == "wake-lock-screen") {
-    type = PermissionType::WAKE_LOCK_SCREEN;
-  } else if (name == "wake-lock-system") {
-    type = PermissionType::WAKE_LOCK_SYSTEM;
-  } else if (name == "nfc") {
-    type = PermissionType::NFC;
-  } else {
-    NOTREACHED();
-    type = PermissionType::NOTIFICATIONS;
-  }
-
-  WebTestContentBrowserClient::Get()
-      ->GetWebTestBrowserContext()
-      ->GetWebTestPermissionManager()
-      ->SetPermission(type, status, origin, embedding_origin);
-}
-
 void WebTestMessageFilter::OnWebTestRuntimeFlagsChanged(
     const base::DictionaryValue& changed_web_test_runtime_flags) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);

content/shell/browser/web_test/web_test_message_filter.h

@@ -16,9 +16,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
-#include "third_party/blink/public/mojom/permissions/permission_status.mojom-forward.h"
-
-class GURL;
 
 namespace base {
 class DictionaryValue;
@@ -69,10 +66,6 @@ class WebTestMessageFilter : public BrowserMessageFilter {
       const base::Optional<int>& action_index,
       const base::Optional<base::string16>& reply);
   void OnDeleteAllCookies();
-  void OnSetPermission(const std::string& name,
-                       blink::mojom::PermissionStatus status,
-                       const GURL& origin,
-                       const GURL& embedding_origin);
   void OnWebTestRuntimeFlagsChanged(
       const base::DictionaryValue& changed_web_test_runtime_flags);
   void OnInitiateCaptureDump(bool capture_navigation_history,

content/shell/common/web_test.mojom

@@ -4,6 +4,9 @@
 
 module content.mojom;
 
+import "third_party/blink/public/mojom/permissions/permission_status.mojom";
+import "url/mojom/url.mojom";
+
 // Web test messages sent from the renderer process to the browser.
 interface WebTestClient {
   // Start to inspect a secondary window.
@@ -28,4 +31,11 @@ interface WebTestClient {
 
   // Reset all permissions of WebTestPermissionManager.
   ResetPermissions();
+
+  // Sets the permission for |name| to |status| when queried or requested in
+  // |origin| from |embedding_origin|.
+  SetPermission(string name,
+               blink.mojom.PermissionStatus status,
+               url.mojom.Url origin,
+               url.mojom.Url embedding_origin);
 };

content/shell/common/web_test/web_test_messages.h

@@ -33,11 +33,6 @@ IPC_MESSAGE_ROUTED3(WebTestHostMsg_SimulateWebNotificationClick,
                     base::Optional<int> /* action_index */,
                     base::Optional<base::string16> /* reply */)
 IPC_MESSAGE_ROUTED0(WebTestHostMsg_DeleteAllCookies)
-IPC_MESSAGE_ROUTED4(WebTestHostMsg_SetPermission,
-                    std::string /* name */,
-                    blink::mojom::PermissionStatus /* status */,
-                    GURL /* origin */,
-                    GURL /* embedding_origin */)
 IPC_MESSAGE_ROUTED2(WebTestHostMsg_InitiateCaptureDump,
                     bool /* should dump navigation history */,
                     bool /* should dump pixels */)

content/shell/renderer/web_test/blink_test_runner.cc

@@ -624,9 +624,8 @@ void BlinkTestRunner::SetPermission(const std::string& name,
                                     const std::string& value,
                                     const GURL& origin,
                                     const GURL& embedding_origin) {
-  Send(new WebTestHostMsg_SetPermission(routing_id(), name,
-                                        blink::ToPermissionStatus(value),
-                                        origin, embedding_origin));
+  GetWebTestClientRemote().SetPermission(name, blink::ToPermissionStatus(value),
+                                         origin, embedding_origin);
 }
 
 void BlinkTestRunner::ResetPermissions() {