Migrate input_injector.mojom to the new Mojo types

Convert the implementation and all users of the
content::mojom::InputInjector interface.

Bug: 955171
Change-Id: I2950bd5d4f0770a4714fead2033ba578e5be639b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1807498Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#697566}

content/browser/frame_host/input/input_injector_impl.cc

@@ -10,7 +10,9 @@
 #include "base/bind.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "content/common/input/input_injector.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace content {
 
@@ -29,10 +31,11 @@ InputInjectorImpl::InputInjectorImpl(
 
 InputInjectorImpl::~InputInjectorImpl() {}
 
-void InputInjectorImpl::Create(base::WeakPtr<RenderFrameHostImpl> frame_host,
-                               mojom::InputInjectorRequest request) {
-  mojo::MakeStrongBinding(std::make_unique<InputInjectorImpl>(frame_host),
-                          std::move(request));
+void InputInjectorImpl::Create(
+    base::WeakPtr<RenderFrameHostImpl> frame_host,
+    mojo::PendingReceiver<mojom::InputInjector> receiver) {
+  mojo::MakeSelfOwnedReceiver(std::make_unique<InputInjectorImpl>(frame_host),
+                              std::move(receiver));
 }
 
 void InputInjectorImpl::QueueSyntheticSmoothDrag(

content/browser/frame_host/input/input_injector_impl.h

@@ -10,6 +10,7 @@
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/common/input/input_injector.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace content {
 
@@ -20,7 +21,7 @@ class CONTENT_EXPORT InputInjectorImpl : public mojom::InputInjector {
   ~InputInjectorImpl() override;
 
   static void Create(base::WeakPtr<RenderFrameHostImpl> frame_host,
-                     mojom::InputInjectorRequest request);
+                     mojo::PendingReceiver<mojom::InputInjector> receiver);
 
   // mojom::InputInjector overrides.
   void QueueSyntheticSmoothDrag(

content/renderer/gpu_benchmarking_extension.cc

@@ -24,6 +24,7 @@
 #include "cc/paint/skia_paint_canvas.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/common/input/actions_parser.h"
+#include "content/common/input/input_injector.mojom.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_pointer_action_list_params.h"
@@ -44,6 +45,7 @@
 #include "gin/object_template_builder.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "gpu/ipc/common/gpu_messages.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/blink/public/platform/web_mouse_event.h"
 #include "third_party/blink/public/web/blink.h"
@@ -304,7 +306,7 @@ bool ThrowIfPointOutOfBounds(GpuBenchmarkingContext* context,
 
 bool BeginSmoothScroll(GpuBenchmarkingContext* context,
                        gin::Arguments* args,
-                       mojom::InputInjectorPtr& injector,
+                       const mojo::Remote<mojom::InputInjector>& injector,
                        float pixels_to_scroll,
                        v8::Local<v8::Function> callback,
                        int gesture_source_type,
@@ -408,7 +410,7 @@ bool BeginSmoothScroll(GpuBenchmarkingContext* context,
 
 bool BeginSmoothDrag(GpuBenchmarkingContext* context,
                      gin::Arguments* args,
-                     mojom::InputInjectorPtr& injector,
+                     const mojo::Remote<mojom::InputInjector>& injector,
                      float start_x,
                      float start_y,
                      float end_x,
@@ -557,9 +559,9 @@ GpuBenchmarking::~GpuBenchmarking() {}
 
 void GpuBenchmarking::EnsureRemoteInterface() {
   if (!input_injector_) {
-    render_frame_->GetRemoteInterfaces()->GetInterface(mojo::MakeRequest(
-        &input_injector_,
-        render_frame_->GetTaskRunner(blink::TaskType::kInternalDefault)));
+    render_frame_->GetRemoteInterfaces()->GetInterface(
+        input_injector_.BindNewPipeAndPassReceiver(
+            render_frame_->GetTaskRunner(blink::TaskType::kInternalDefault)));
   }
 }
 

content/renderer/gpu_benchmarking_extension.h

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "content/common/input/input_injector.mojom.h"
 #include "gin/wrappable.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 namespace gin {
 class Arguments;
@@ -99,7 +100,7 @@ class GpuBenchmarking : public gin::Wrappable<GpuBenchmarking> {
   bool AddSwapCompletionEventListener(gin::Arguments* args);
 
   RenderFrameImpl* render_frame_;
-  mojom::InputInjectorPtr input_injector_;
+  mojo::Remote<mojom::InputInjector> input_injector_;
   DISALLOW_COPY_AND_ASSIGN(GpuBenchmarking);
 };