Convert FingerprintObserver to new Mojo types

This CL converts FingerprintObserverPtr and
FingerprintObserverRequest in chrome, services and ui to the new
Mojo type, and uses pending_remote<FingerprintObserver> in
fingerprint.mojom.

Bug: 955171
Change-Id: Ide42fdb94bc69b100b5fce68f672cc86ef6f7c27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792464
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696021}

chrome/browser/chromeos/login/lock/screen_locker.cc

@@ -177,7 +177,7 @@ ScreenLocker::Delegate::~Delegate() = default;
 // ScreenLocker, public:
 
 ScreenLocker::ScreenLocker(const user_manager::UserList& users)
-    : users_(users), fingerprint_observer_binding_(this) {
+    : users_(users) {
   DCHECK(!screen_locker_);
   screen_locker_ = this;
 
@@ -190,9 +190,8 @@ ScreenLocker::ScreenLocker(const user_manager::UserList& users)
   content::GetSystemConnector()->Connect(
       device::mojom::kServiceName, fp_service_.BindNewPipeAndPassReceiver());
 
-  device::mojom::FingerprintObserverPtr observer;
-  fingerprint_observer_binding_.Bind(mojo::MakeRequest(&observer));
-  fp_service_->AddFingerprintObserver(std::move(observer));
+  fp_service_->AddFingerprintObserver(
+      fingerprint_observer_receiver_.BindNewPipeAndPassRemote());
 
   GetLoginScreenCertProviderService()->pin_dialog_manager()->AddPinDialogHost(
       &security_token_pin_dialog_host_ash_impl_);

chrome/browser/chromeos/login/lock/screen_locker.h

@@ -27,7 +27,7 @@
 #include "chromeos/login/auth/challenge_response_key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/user_manager/user.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/fingerprint.mojom.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -287,8 +287,8 @@ class ScreenLocker : public AuthStatusConsumer,
   scoped_refptr<input_method::InputMethodManager::State> saved_ime_state_;
 
   mojo::Remote<device::mojom::Fingerprint> fp_service_;
-  mojo::Binding<device::mojom::FingerprintObserver>
-      fingerprint_observer_binding_;
+  mojo::Receiver<device::mojom::FingerprintObserver>
+      fingerprint_observer_receiver_{this};
 
   // ViewsScreenLocker instance in use.
   std::unique_ptr<ViewsScreenLocker> views_screen_locker_;

chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.cc

@@ -57,9 +57,7 @@ FingerprintSetupScreenHandler::FingerprintSetupScreenHandler(
 
   content::GetSystemConnector()->Connect(
       device::mojom::kServiceName, fp_service_.BindNewPipeAndPassReceiver());
-  device::mojom::FingerprintObserverPtr observer;
-  binding_.Bind(mojo::MakeRequest(&observer));
-  fp_service_->AddFingerprintObserver(std::move(observer));
+  fp_service_->AddFingerprintObserver(receiver_.BindNewPipeAndPassRemote());
 }
 
 FingerprintSetupScreenHandler::~FingerprintSetupScreenHandler() = default;

chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/fingerprint.mojom.h"
 
@@ -77,7 +77,7 @@ class FingerprintSetupScreenHandler
   FingerprintSetupScreen* screen_ = nullptr;
 
   mojo::Remote<device::mojom::Fingerprint> fp_service_;
-  mojo::Binding<device::mojom::FingerprintObserver> binding_{this};
+  mojo::Receiver<device::mojom::FingerprintObserver> receiver_{this};
   int enrolled_finger_count_ = 0;
   bool enroll_session_started_ = false;
 

chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc

@@ -58,7 +58,7 @@ std::unique_ptr<base::DictionaryValue> GetFingerprintsInfo(
 }  // namespace
 
 FingerprintHandler::FingerprintHandler(Profile* profile)
-    : profile_(profile), binding_(this), session_observer_(this) {
+    : profile_(profile), session_observer_(this) {
   content::GetSystemConnector()->Connect(
       device::mojom::kServiceName, fp_service_.BindNewPipeAndPassReceiver());
   user_id_ = ProfileHelper::Get()->GetUserIdHashFromProfile(profile);
@@ -111,14 +111,12 @@ void FingerprintHandler::OnJavascriptAllowed() {
   if (SessionManager::Get())
     session_observer_.Add(SessionManager::Get());
 
-  device::mojom::FingerprintObserverPtr observer;
-  binding_.Bind(mojo::MakeRequest(&observer));
-  fp_service_->AddFingerprintObserver(std::move(observer));
+  fp_service_->AddFingerprintObserver(receiver_.BindNewPipeAndPassRemote());
 }
 
 void FingerprintHandler::OnJavascriptDisallowed() {
   session_observer_.RemoveAll();
-  binding_.Close();
+  receiver_.reset();
 }
 
 void FingerprintHandler::OnRestarted() {}

chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h

@@ -9,7 +9,7 @@
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "components/session_manager/core/session_manager_observer.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/fingerprint.mojom.h"
 
@@ -81,7 +81,7 @@ class FingerprintHandler : public ::settings::SettingsPageUIHandler,
   std::string user_id_;
 
   mojo::Remote<device::mojom::Fingerprint> fp_service_;
-  mojo::Binding<device::mojom::FingerprintObserver> binding_;
+  mojo::Receiver<device::mojom::FingerprintObserver> receiver_{this};
   ScopedObserver<session_manager::SessionManager,
                  session_manager::SessionManagerObserver>
       session_observer_;

services/device/fingerprint/fingerprint_chromeos.cc

@@ -203,8 +203,10 @@ void FingerprintChromeOS::RequestType(RequestTypeCallback callback) {
 }
 
 void FingerprintChromeOS::AddFingerprintObserver(
-    mojom::FingerprintObserverPtr observer) {
-  observer.set_connection_error_handler(
+    mojo::PendingRemote<mojom::FingerprintObserver> pending_observer) {
+  mojo::Remote<mojom::FingerprintObserver> observer(
+      std::move(pending_observer));
+  observer.set_disconnect_handler(
       base::Bind(&FingerprintChromeOS::OnFingerprintObserverDisconnected,
                  base::Unretained(this), observer.get()));
   observers_.push_back(std::move(observer));

services/device/fingerprint/fingerprint_chromeos.h

@@ -11,6 +11,8 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "chromeos/dbus/biod/biod_client.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/fingerprint/fingerprint_export.h"
 #include "services/device/public/mojom/fingerprint.mojom.h"
 
@@ -55,7 +57,8 @@ class SERVICES_DEVICE_FINGERPRINT_EXPORT FingerprintChromeOS
   void EndCurrentAuthSession(EndCurrentAuthSessionCallback callback) override;
   void DestroyAllRecords(DestroyAllRecordsCallback callback) override;
   void RequestType(RequestTypeCallback callback) override;
-  void AddFingerprintObserver(mojom::FingerprintObserverPtr observer) override;
+  void AddFingerprintObserver(mojo::PendingRemote<mojom::FingerprintObserver>
+                                  pending_observer) override;
 
  private:
   friend class FingerprintChromeOSTest;
@@ -90,7 +93,7 @@ class SERVICES_DEVICE_FINGERPRINT_EXPORT FingerprintChromeOS
   // Start next request of GetRecordsForUser.
   void StartNextRequest();
 
-  std::vector<mojom::FingerprintObserverPtr> observers_;
+  std::vector<mojo::Remote<mojom::FingerprintObserver>> observers_;
 
   // Saves record object path to label mapping for current GetRecordsForUser
   // request, and reset after the request is done.

services/device/fingerprint/fingerprint_chromeos_unittest.cc

@@ -9,15 +9,18 @@
 #include "base/run_loop.h"
 #include "base/test/task_environment.h"
 #include "chromeos/dbus/biod/fake_biod_client.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
 
 class FakeFingerprintObserver : public mojom::FingerprintObserver {
  public:
-  explicit FakeFingerprintObserver(mojom::FingerprintObserverRequest request)
-      : binding_(this, std::move(request)) {}
+  explicit FakeFingerprintObserver(
+      mojo::PendingReceiver<mojom::FingerprintObserver> receiver)
+      : receiver_(this, std::move(receiver)) {}
   ~FakeFingerprintObserver() override {}
 
   // mojom::FingerprintObserver
@@ -45,7 +48,7 @@ class FakeFingerprintObserver : public mojom::FingerprintObserver {
   int session_failures() { return session_failures_; }
 
  private:
-  mojo::Binding<mojom::FingerprintObserver> binding_;
+  mojo::Receiver<mojom::FingerprintObserver> receiver_;
   int enroll_scan_dones_ = 0;  // Count of enroll scan done signal received.
   int auth_scan_dones_ = 0;    // Count of auth scan done signal received.
   int restarts_ = 0;           // Count of restart signal received.
@@ -133,9 +136,10 @@ class FingerprintChromeOSTest : public testing::Test {
 };
 
 TEST_F(FingerprintChromeOSTest, FingerprintObserverTest) {
-  mojom::FingerprintObserverPtr proxy;
-  FakeFingerprintObserver observer(mojo::MakeRequest(&proxy));
-  fingerprint()->AddFingerprintObserver(std::move(proxy));
+  mojo::PendingRemote<mojom::FingerprintObserver> pending_observer;
+  FakeFingerprintObserver observer(
+      pending_observer.InitWithNewPipeAndPassReceiver());
+  fingerprint()->AddFingerprintObserver(std::move(pending_observer));
 
   GenerateRestartSignal();
   base::RunLoop().RunUntilIdle();

services/device/public/mojom/fingerprint.mojom

@@ -84,7 +84,7 @@ interface Fingerprint {
   DestroyAllRecords() => (bool success);
 
   // Adds fingerprint observers and notifies them when receiving signals.
-  AddFingerprintObserver(FingerprintObserver observer);
+  AddFingerprintObserver(pending_remote<FingerprintObserver> observer);
 
   // Requests the type of biometric.
   RequestType() => (BiometricType type);

ui/chromeos/user_activity_power_manager_notifier.cc

@@ -46,7 +46,7 @@ power_manager::UserActivityType GetUserActivityTypeForEvent(
 UserActivityPowerManagerNotifier::UserActivityPowerManagerNotifier(
     UserActivityDetector* detector,
     service_manager::Connector* connector)
-    : detector_(detector), fingerprint_observer_binding_(this) {
+    : detector_(detector) {
   detector_->AddObserver(this);
   ui::DeviceDataManager::GetInstance()->AddObserver(this);
   chromeos::PowerManagerClient::Get()->AddObserver(this);
@@ -57,9 +57,8 @@ UserActivityPowerManagerNotifier::UserActivityPowerManagerNotifier(
     // I.e., when user tried to use fingerprint to unlock.
     connector->Connect(device::mojom::kServiceName,
                        fingerprint_.BindNewPipeAndPassReceiver());
-    device::mojom::FingerprintObserverPtr observer;
-    fingerprint_observer_binding_.Bind(mojo::MakeRequest(&observer));
-    fingerprint_->AddFingerprintObserver(std::move(observer));
+    fingerprint_->AddFingerprintObserver(
+        fingerprint_observer_receiver_.BindNewPipeAndPassRemote());
   }
 }
 

ui/chromeos/user_activity_power_manager_notifier.h

@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "chromeos/dbus/power/power_manager_client.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/fingerprint.mojom.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -68,8 +68,8 @@ class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier
   UserActivityDetector* detector_;  // not owned
 
   mojo::Remote<device::mojom::Fingerprint> fingerprint_;
-  mojo::Binding<device::mojom::FingerprintObserver>
-      fingerprint_observer_binding_;
+  mojo::Receiver<device::mojom::FingerprintObserver>
+      fingerprint_observer_receiver_{this};
 
   // Last time that the power manager was notified.
   base::TimeTicks last_notify_time_;