Convert AssistantSettingsManager to new Mojo types

This CL converts AssistantSettingsManager from settings.mojom to
new Mojo types using  Remote, ReceiverSet, and PendingReceiver.

Bug: 955171
Change-Id: I87dac56b4e0fb8f13c3e2c39785418619a7eabfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1871999Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#709365}

chrome/browser/chromeos/login/screens/assistant_optin_flow_screen_browsertest.cc

@@ -34,7 +34,8 @@
 #include "chromeos/services/assistant/public/proto/settings_ui.pb.h"
 #include "chromeos/services/assistant/service.h"
 #include "components/prefs/pref_service.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/default_handlers.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -141,12 +142,13 @@ class FakeAssistantSettings
     speaker_id_enrollment_state_ = SpeakerIdEnrollmentState::IDLE;
   }
 
-  void Flush() { bindings_.FlushForTesting(); }
+  void Flush() { receivers_.FlushForTesting(); }
 
   // chromeos::assistant::AssistantSettingsManager:
-  void BindRequest(chromeos::assistant::mojom::AssistantSettingsManagerRequest
-                       request) override {
-    bindings_.AddBinding(this, std::move(request));
+  void BindReceiver(mojo::PendingReceiver<
+                    chromeos::assistant::mojom::AssistantSettingsManager>
+                        receiver) override {
+    receivers_.Add(this, std::move(receiver));
   }
 
   // chromeos::assistant::mojom::AssistantSettingsManager:
@@ -292,8 +294,8 @@ class FakeAssistantSettings
     PROCESSING
   };
 
-  mojo::BindingSet<chromeos::assistant::mojom::AssistantSettingsManager>
-      bindings_;
+  mojo::ReceiverSet<chromeos::assistant::mojom::AssistantSettingsManager>
+      receivers_;
 
   // The service test config:
   int consent_ui_flags_ = CONSENT_UI_FLAGS_NONE;

chrome/browser/ui/ash/assistant/assistant_setup.cc

@@ -54,7 +54,7 @@ void AssistantSetup::OnAssistantStatusChanged(
 
 void AssistantSetup::SyncSettingsState() {
   // Set up settings mojom.
-  service_->BindSettingsManager(mojo::MakeRequest(&settings_manager_));
+  service_->BindSettingsManager(settings_manager_.BindNewPipeAndPassReceiver());
 
   chromeos::assistant::SettingsUiSelector selector;
   chromeos::assistant::ConsentFlowUiSelector* consent_flow_ui =

chrome/browser/ui/ash/assistant/assistant_setup.h

@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/assistant/public/mojom/assistant.mojom.h"
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 // AssistantSetup is the class responsible for start Assistant OptIn flow.
 class AssistantSetup : public ash::AssistantSetup,
@@ -38,7 +39,8 @@ class AssistantSetup : public ash::AssistantSetup,
   void OnGetSettingsResponse(const std::string& settings);
 
   chromeos::assistant::mojom::AssistantService* const service_;
-  chromeos::assistant::mojom::AssistantSettingsManagerPtr settings_manager_;
+  mojo::Remote<chromeos::assistant::mojom::AssistantSettingsManager>
+      settings_manager_;
 
   base::WeakPtrFactory<AssistantSetup> weak_factory_{this};
 

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

@@ -293,7 +293,7 @@ void AssistantOptInFlowScreenHandler::BindAssistantSettingsManager() {
   AssistantServiceConnection::GetForProfile(
       ProfileManager::GetActiveUserProfile())
       ->service()
-      ->BindSettingsManager(mojo::MakeRequest(&settings_manager_));
+      ->BindSettingsManager(settings_manager_.BindNewPipeAndPassReceiver());
 
   if (initialized_) {
     SendGetSettingsRequest();

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

@@ -14,6 +14,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 namespace chromeos {
 
@@ -163,7 +164,7 @@ class AssistantOptInFlowScreenHandler
   bool initialized_ = false;
 
   mojo::Binding<assistant::mojom::SpeakerIdEnrollmentClient> client_binding_;
-  assistant::mojom::AssistantSettingsManagerPtr settings_manager_;
+  mojo::Remote<assistant::mojom::AssistantSettingsManager> settings_manager_;
   base::WeakPtrFactory<AssistantOptInFlowScreenHandler> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(AssistantOptInFlowScreenHandler);

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

@@ -106,7 +106,7 @@ void GoogleAssistantHandler::BindAssistantSettingsManager() {
   // Set up settings mojom.
   AssistantServiceConnection::GetForProfile(profile_)
       ->service()
-      ->BindSettingsManager(mojo::MakeRequest(&settings_manager_));
+      ->BindSettingsManager(settings_manager_.BindNewPipeAndPassReceiver());
 }
 
 }  // namespace settings

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

@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 class Profile;
 
@@ -45,7 +45,7 @@ class GoogleAssistantHandler : public ::settings::SettingsPageUIHandler,
 
   Profile* const profile_;
 
-  assistant::mojom::AssistantSettingsManagerPtr settings_manager_;
+  mojo::Remote<assistant::mojom::AssistantSettingsManager> settings_manager_;
 
   bool pending_hotword_update_ = false;
 

chromeos/services/assistant/assistant_settings_manager.h

@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace chromeos {
 namespace assistant {
@@ -17,7 +18,8 @@ class AssistantSettingsManager : public mojom::AssistantSettingsManager {
  public:
   ~AssistantSettingsManager() override = default;
 
-  virtual void BindRequest(mojom::AssistantSettingsManagerRequest request) = 0;
+  virtual void BindReceiver(
+      mojo::PendingReceiver<mojom::AssistantSettingsManager> receiver) = 0;
 };
 
 }  // namespace assistant

chromeos/services/assistant/assistant_settings_manager_impl.cc

@@ -45,9 +45,9 @@ AssistantSettingsManagerImpl::AssistantSettingsManagerImpl(
 
 AssistantSettingsManagerImpl::~AssistantSettingsManagerImpl() = default;
 
-void AssistantSettingsManagerImpl::BindRequest(
-    mojom::AssistantSettingsManagerRequest request) {
-  bindings_.AddBinding(this, std::move(request));
+void AssistantSettingsManagerImpl::BindReceiver(
+    mojo::PendingReceiver<mojom::AssistantSettingsManager> receiver) {
+  receivers_.Add(this, std::move(receiver));
 }
 
 void AssistantSettingsManagerImpl::GetSettings(const std::string& selector,

chromeos/services/assistant/assistant_settings_manager_impl.h

@@ -10,8 +10,8 @@
 
 #include "chromeos/services/assistant/assistant_settings_manager.h"
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/public/cpp/bindings/interface_ptr_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace ash {
 class AssistantStateBase;
@@ -46,7 +46,8 @@ class AssistantSettingsManagerImpl : public AssistantSettingsManager {
   bool speaker_id_enrollment_done() { return speaker_id_enrollment_done_; }
 
   // AssistantSettingsManager overrides:
-  void BindRequest(mojom::AssistantSettingsManagerRequest request) override;
+  void BindReceiver(
+      mojo::PendingReceiver<mojom::AssistantSettingsManager> receiver) override;
 
   // mojom::AssistantSettingsManager overrides:
   void GetSettings(const std::string& selector,
@@ -84,7 +85,7 @@ class AssistantSettingsManagerImpl : public AssistantSettingsManager {
   // Whether the speaker id enrollment has complete for the user.
   bool speaker_id_enrollment_done_ = false;
 
-  mojo::BindingSet<mojom::AssistantSettingsManager> bindings_;
+  mojo::ReceiverSet<mojom::AssistantSettingsManager> receivers_;
 
   base::WeakPtrFactory<AssistantSettingsManagerImpl> weak_factory_;
 

chromeos/services/assistant/fake_assistant_settings_manager_impl.cc

@@ -42,9 +42,9 @@ void FakeAssistantSettingsManagerImpl::StopSpeakerIdEnrollment(
   std::move(callback).Run();
 }
 
-void FakeAssistantSettingsManagerImpl::BindRequest(
-    mojom::AssistantSettingsManagerRequest request) {
-  bindings_.AddBinding(this, std::move(request));
+void FakeAssistantSettingsManagerImpl::BindReceiver(
+    mojo::PendingReceiver<mojom::AssistantSettingsManager> receiver) {
+  receivers_.Add(this, std::move(receiver));
 }
 
 }  // namespace assistant

chromeos/services/assistant/fake_assistant_settings_manager_impl.h

@@ -10,7 +10,8 @@
 
 #include "chromeos/services/assistant/assistant_settings_manager.h"
 #include "chromeos/services/assistant/public/mojom/settings.mojom.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace chromeos {
 namespace assistant {
@@ -33,10 +34,11 @@ class FakeAssistantSettingsManagerImpl : public AssistantSettingsManager {
   void SyncSpeakerIdEnrollmentStatus() override {}
 
   // AssistantSettingsManager overrides:
-  void BindRequest(mojom::AssistantSettingsManagerRequest request) override;
+  void BindReceiver(
+      mojo::PendingReceiver<mojom::AssistantSettingsManager> receiver) override;
 
  private:
-  mojo::BindingSet<mojom::AssistantSettingsManager> bindings_;
+  mojo::ReceiverSet<mojom::AssistantSettingsManager> receivers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeAssistantSettingsManagerImpl);
 };

chromeos/services/assistant/service.cc

@@ -216,12 +216,12 @@ void Service::BindSettingsManager(
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (g_settings_manager_override) {
-    g_settings_manager_override->BindRequest(std::move(receiver));
+    g_settings_manager_override->BindReceiver(std::move(receiver));
     return;
   }
 
   DCHECK(assistant_manager_service_);
-  assistant_manager_service_->GetAssistantSettingsManager()->BindRequest(
+  assistant_manager_service_->GetAssistantSettingsManager()->BindReceiver(
       std::move(receiver));
 }