Migrate references of shape_detection::mojom::FaceDetection[Provider]

Convert the remaining bits in both the implementation and clients from the
browser and renderer processes for the mojom.FaceDetection[Provider]
interface, and adapt tests.

Bug: 955171, 978694
Change-Id: I97c5ebebb2d3e3df24a4fe481987042ce0dff9de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1827279Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#701268}

content/browser/renderer_interface_binders.cc

@@ -122,10 +122,11 @@ void BindBarcodeDetectionProvider(
 }
 
 void BindFaceDetectionProvider(
-    shape_detection::mojom::FaceDetectionProviderRequest request,
+    mojo::PendingReceiver<shape_detection::mojom::FaceDetectionProvider>
+        receiver,
     RenderProcessHost* host,
     const url::Origin& origin) {
-  GetShapeDetectionService()->BindFaceDetectionProvider(std::move(request));
+  GetShapeDetectionService()->BindFaceDetectionProvider(std::move(receiver));
 }
 
 void BindTextDetection(

services/shape_detection/face_detection_impl_mac_vision.h

@@ -12,7 +12,7 @@
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/shape_detection/detection_utils_mac.h"
 #include "services/shape_detection/public/mojom/facedetection.mojom.h"
 
@@ -31,8 +31,8 @@ class API_AVAILABLE(macos(10.13)) FaceDetectionImplMacVision
   void Detect(const SkBitmap& bitmap,
               mojom::FaceDetection::DetectCallback callback) override;
 
-  void SetBinding(mojo::StrongBindingPtr<mojom::FaceDetection> binding) {
-    binding_ = std::move(binding);
+  void SetReceiver(mojo::SelfOwnedReceiverRef<mojom::FaceDetection> receiver) {
+    receiver_ = std::move(receiver);
   }
 
  private:
@@ -41,7 +41,7 @@ class API_AVAILABLE(macos(10.13)) FaceDetectionImplMacVision
   CGSize image_size_;
   std::unique_ptr<VisionAPIAsyncRequestMac> landmarks_async_request_;
   DetectCallback detected_callback_;
-  mojo::StrongBindingPtr<mojom::FaceDetection> binding_;
+  mojo::SelfOwnedReceiverRef<mojom::FaceDetection> receiver_;
   base::WeakPtrFactory<FaceDetectionImplMacVision> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FaceDetectionImplMacVision);

services/shape_detection/face_detection_impl_mac_vision.mm

@@ -63,14 +63,14 @@ void FaceDetectionImplMacVision::Detect(const SkBitmap& bitmap,
   detected_callback_ = std::move(callback);
   // This prevents the Detect function from being called before the
   // VisionAPIAsyncRequestMac completes.
-  if (binding_)  // Can be unbound in unit testing.
-    binding_->PauseIncomingMethodCallProcessing();
+  if (receiver_)  // Can be unbound in unit testing.
+    receiver_->PauseIncomingMethodCallProcessing();
 }
 
 void FaceDetectionImplMacVision::OnFacesDetected(VNRequest* request,
                                                  NSError* error) {
-  if (binding_)  // Can be unbound in unit testing.
-    binding_->ResumeIncomingMethodCallProcessing();
+  if (receiver_)  // Can be unbound in unit testing.
+    receiver_->ResumeIncomingMethodCallProcessing();
 
   if (![request.results count] || error) {
     std::move(detected_callback_).Run({});

services/shape_detection/face_detection_impl_win.cc

@@ -47,7 +47,7 @@ void FaceDetectionImplWin::Detect(const SkBitmap& bitmap,
   detected_face_callback_ = std::move(callback);
   // This prevents the Detect function from being called before the
   // AsyncOperation completes.
-  binding_->PauseIncomingMethodCallProcessing();
+  receiver_->PauseIncomingMethodCallProcessing();
 }
 
 HRESULT FaceDetectionImplWin::BeginDetect(const SkBitmap& bitmap) {
@@ -122,7 +122,7 @@ void FaceDetectionImplWin::OnFaceDetected(
     ComPtr<IVector<DetectedFace*>> result) {
   std::move(detected_face_callback_)
       .Run(BuildFaceDetectionResult(std::move(result)));
-  binding_->ResumeIncomingMethodCallProcessing();
+  receiver_->ResumeIncomingMethodCallProcessing();
 }
 
 }  // namespace shape_detection

services/shape_detection/face_detection_impl_win.h

@@ -16,7 +16,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/shape_detection/public/mojom/facedetection.mojom.h"
 
 class SkBitmap;
@@ -34,8 +34,8 @@ class FaceDetectionImplWin : public mojom::FaceDetection {
       ABI::Windows::Graphics::Imaging::BitmapPixelFormat pixel_format);
   ~FaceDetectionImplWin() override;
 
-  void SetBinding(mojo::StrongBindingPtr<mojom::FaceDetection> binding) {
-    binding_ = std::move(binding);
+  void SetReceiver(mojo::SelfOwnedReceiverRef<mojom::FaceDetection> receiver) {
+    receiver_ = std::move(receiver);
   }
 
   // mojom::FaceDetection implementation.
@@ -62,7 +62,7 @@ class FaceDetectionImplWin : public mojom::FaceDetection {
   ABI::Windows::Graphics::Imaging::BitmapPixelFormat pixel_format_;
 
   DetectCallback detected_face_callback_;
-  mojo::StrongBindingPtr<mojom::FaceDetection> binding_;
+  mojo::SelfOwnedReceiverRef<mojom::FaceDetection> receiver_;
 
   base::WeakPtrFactory<FaceDetectionImplWin> weak_factory_{this};
 

services/shape_detection/face_detection_provider_impl.h

@@ -5,7 +5,8 @@
 #ifndef SERVICES_SHAPE_DETECTION_FACE_DETECTION_PROVIDER_IMPL_H_
 #define SERVICES_SHAPE_DETECTION_FACE_DETECTION_PROVIDER_IMPL_H_
 
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
 namespace shape_detection {
@@ -16,9 +17,10 @@ class FaceDetectionProviderImpl
   ~FaceDetectionProviderImpl() override = default;
 
   static void Create(
-      shape_detection::mojom::FaceDetectionProviderRequest request) {
-    mojo::MakeStrongBinding(std::make_unique<FaceDetectionProviderImpl>(),
-                            std::move(request));
+      mojo::PendingReceiver<shape_detection::mojom::FaceDetectionProvider>
+          receiver) {
+    mojo::MakeSelfOwnedReceiver(std::make_unique<FaceDetectionProviderImpl>(),
+                                std::move(receiver));
   }
 
   void CreateFaceDetection(

services/shape_detection/face_detection_provider_mac.h

@@ -6,6 +6,7 @@
 #define SERVICES_SHAPE_DETECTION_FACE_DETECTION_PROVIDER_MAC_H_
 
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
 namespace shape_detection {
@@ -18,9 +19,10 @@ class FaceDetectionProviderMac
   FaceDetectionProviderMac();
   ~FaceDetectionProviderMac() override;
 
-  // Binds FaceDetection provider request to the implementation of
+  // Binds FaceDetection provider receiver to the implementation of
   // mojom::FaceDetectionProvider.
-  static void Create(mojom::FaceDetectionProviderRequest request);
+  static void Create(
+      mojo::PendingReceiver<mojom::FaceDetectionProvider> receiver);
 
   void CreateFaceDetection(mojo::PendingReceiver<mojom::FaceDetection> receiver,
                            mojom::FaceDetectorOptionsPtr options) override;

services/shape_detection/face_detection_provider_mac.mm

@@ -7,6 +7,7 @@
 #include <memory>
 #include <utility>
 
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/shape_detection/face_detection_impl_mac.h"
 #include "services/shape_detection/face_detection_impl_mac_vision.h"
@@ -19,9 +20,9 @@ FaceDetectionProviderMac::~FaceDetectionProviderMac() = default;
 
 // static
 void FaceDetectionProviderMac::Create(
-    mojom::FaceDetectionProviderRequest request) {
-  mojo::MakeStrongBinding(std::make_unique<FaceDetectionProviderMac>(),
-                          std::move(request));
+    mojo::PendingReceiver<mojom::FaceDetectionProvider> receiver) {
+  mojo::MakeSelfOwnedReceiver(std::make_unique<FaceDetectionProviderMac>(),
+                              std::move(receiver));
 }
 
 void FaceDetectionProviderMac::CreateFaceDetection(
@@ -34,9 +35,8 @@ void FaceDetectionProviderMac::CreateFaceDetection(
     if (!options->fast_mode) {
       auto impl = std::make_unique<FaceDetectionImplMacVision>();
       auto* impl_ptr = impl.get();
-      impl_ptr->SetBinding(mojo::MakeStrongBinding(
-          std::move(impl),
-          mojo::InterfaceRequest<mojom::FaceDetection>(std::move(receiver))));
+      impl_ptr->SetReceiver(
+          mojo::MakeSelfOwnedReceiver(std::move(impl), std::move(receiver)));
       return;
     }
   }

services/shape_detection/face_detection_provider_win.cc

@@ -13,7 +13,8 @@
 #include "base/win/post_async_results.h"
 #include "base/win/scoped_hstring.h"
 #include "base/win/windows_version.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace shape_detection {
 
@@ -111,7 +112,7 @@ void FaceDetectionProviderWin::CreateFaceDetection(
   // the message pipe, then the callback OnFaceDetectorCreated will be not
   // called. This prevents this object from being destroyed before the
   // AsyncOperation completes.
-  binding_->PauseIncomingMethodCallProcessing();
+  receiver_->PauseIncomingMethodCallProcessing();
 }
 
 FaceDetectionProviderWin::FaceDetectionProviderWin() {}
@@ -122,7 +123,7 @@ void FaceDetectionProviderWin::OnFaceDetectorCreated(
     mojo::PendingReceiver<shape_detection::mojom::FaceDetection> receiver,
     BitmapPixelFormat pixel_format,
     ComPtr<IFaceDetector> face_detector) {
-  binding_->ResumeIncomingMethodCallProcessing();
+  receiver_->ResumeIncomingMethodCallProcessing();
 
   if (!face_detector)
     return;
@@ -140,10 +141,8 @@ void FaceDetectionProviderWin::OnFaceDetectorCreated(
   auto impl = std::make_unique<FaceDetectionImplWin>(
       std::move(face_detector), std::move(bitmap_factory), pixel_format);
   auto* impl_ptr = impl.get();
-  impl_ptr->SetBinding(mojo::MakeStrongBinding(
-      std::move(impl),
-      mojo::InterfaceRequest<shape_detection::mojom::FaceDetection>(
-          std::move(receiver))));
+  impl_ptr->SetReceiver(
+      mojo::MakeSelfOwnedReceiver(std::move(impl), std::move(receiver)));
 }
 
 }  // namespace shape_detection

services/shape_detection/face_detection_provider_win.h

@@ -13,7 +13,8 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/shape_detection/face_detection_impl_win.h"
 #include "services/shape_detection/public/mojom/facedetection_provider.mojom.h"
 
@@ -26,11 +27,12 @@ class FaceDetectionProviderWin
   ~FaceDetectionProviderWin() override;
 
   static void Create(
-      shape_detection::mojom::FaceDetectionProviderRequest request) {
+      mojo::PendingReceiver<shape_detection::mojom::FaceDetectionProvider>
+          receiver) {
     auto provider = std::make_unique<FaceDetectionProviderWin>();
     auto* provider_ptr = provider.get();
-    provider_ptr->binding_ =
-        mojo::MakeStrongBinding(std::move(provider), std::move(request));
+    provider_ptr->receiver_ =
+        mojo::MakeSelfOwnedReceiver(std::move(provider), std::move(receiver));
   }
 
   void CreateFaceDetection(
@@ -44,7 +46,7 @@ class FaceDetectionProviderWin
       Microsoft::WRL::ComPtr<ABI::Windows::Media::FaceAnalysis::IFaceDetector>
           face_detector);
 
-  mojo::StrongBindingPtr<mojom::FaceDetectionProvider> binding_;
+  mojo::SelfOwnedReceiverRef<mojom::FaceDetectionProvider> receiver_;
   base::WeakPtrFactory<FaceDetectionProviderWin> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(FaceDetectionProviderWin);

third_party/blink/renderer/modules/shapedetection/face_detector.cc

@@ -37,12 +37,12 @@ FaceDetector::FaceDetector(ExecutionContext* context,
   face_detector_options->max_detected_faces = options->maxDetectedFaces();
   face_detector_options->fast_mode = options->fastMode();
 
-  shape_detection::mojom::blink::FaceDetectionProviderPtr provider;
+  mojo::Remote<shape_detection::mojom::blink::FaceDetectionProvider> provider;
   // See https://bit.ly/2S0zRAS for task types.
   auto task_runner = context->GetTaskRunner(TaskType::kMiscPlatformAPI);
-  auto request = mojo::MakeRequest(&provider, task_runner);
   if (auto* interface_provider = context->GetInterfaceProvider()) {
-    interface_provider->GetInterface(std::move(request));
+    interface_provider->GetInterface(
+        provider.BindNewPipeAndPassReceiver(task_runner));
   }
   provider->CreateFaceDetection(
       face_service_.BindNewPipeAndPassReceiver(task_runner),