Convert MediaController and MediaControllerImageObserver to new Mojo types

This CL converts MediaControllerPtr and
MediaControllerImageObserverPtr in chromeos, content and services
to the new Mojo type.

Bug: 955171
Change-Id: I319a6e0092cdc4e2c7481fd89e92abe939af147c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849740Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Tao Wu <wutao@chromium.org>
Reviewed-by: Olga Sharonova <olka@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#705925}

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -171,7 +171,7 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl(
   client->RequestMediaControllerManager(
       media_controller_manager.BindNewPipeAndPassReceiver());
   media_controller_manager->CreateActiveMediaController(
-      mojo::MakeRequest(&media_controller_));
+      media_controller_.BindNewPipeAndPassReceiver());
 }
 
 AssistantManagerServiceImpl::~AssistantManagerServiceImpl() {

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -28,6 +28,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/bindings/remote_set.h"
 #include "services/device/public/mojom/battery_monitor.mojom.h"
 #include "services/media_session/public/mojom/media_controller.mojom.h"
@@ -342,7 +343,7 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
       nullptr;
   mojo::RemoteSet<mojom::AssistantInteractionSubscriber>
       interaction_subscribers_;
-  media_session::mojom::MediaControllerPtr media_controller_;
+  mojo::Remote<media_session::mojom::MediaController> media_controller_;
 
   // Owned by the parent |Service| which will destroy |this| before |context_|.
   ServiceContext* const context_;

content/browser/media/mpris_notifier.cc

@@ -35,11 +35,11 @@ void MprisNotifier::Initialize() {
   connector_->BindInterface(media_session::mojom::kServiceName,
                             mojo::MakeRequest(&controller_manager_ptr));
   controller_manager_ptr->CreateActiveMediaController(
-      mojo::MakeRequest(&media_controller_ptr_));
+      media_controller_.BindNewPipeAndPassReceiver());
 
   // Observe the active media controller for changes to playback state and
   // supported actions.
-  media_controller_ptr_->AddObserver(
+  media_controller_->AddObserver(
       media_controller_observer_receiver_.BindNewPipeAndPassRemote());
 }
 

content/browser/media/mpris_notifier.h

@@ -10,6 +10,7 @@
 
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/public/mojom/media_controller.mojom.h"
 
 namespace mpris {
@@ -61,7 +62,7 @@ class CONTENT_EXPORT MprisNotifier
   service_manager::Connector* connector_;
 
   // Tracks current media session state/metadata.
-  media_session::mojom::MediaControllerPtr media_controller_ptr_;
+  mojo::Remote<media_session::mojom::MediaController> media_controller_;
   media_session::mojom::MediaSessionInfoPtr session_info_;
 
   // Used to receive updates to the active media controller.

content/browser/media/now_playing_info_center_notifier.cc

@@ -30,11 +30,11 @@ NowPlayingInfoCenterNotifier::NowPlayingInfoCenterNotifier(
   connector->BindInterface(media_session::mojom::kServiceName,
                            mojo::MakeRequest(&controller_manager_ptr));
   controller_manager_ptr->CreateActiveMediaController(
-      mojo::MakeRequest(&media_controller_ptr_));
+      media_controller_.BindNewPipeAndPassReceiver());
 
   // Observe the active media controller for changes to playback state and
   // supported actions.
-  media_controller_ptr_->AddObserver(
+  media_controller_->AddObserver(
       media_controller_observer_receiver_.BindNewPipeAndPassRemote());
 }
 

content/browser/media/now_playing_info_center_notifier.h

@@ -10,6 +10,7 @@
 
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/public/mojom/media_controller.mojom.h"
 
 namespace now_playing {
@@ -54,7 +55,7 @@ class CONTENT_EXPORT NowPlayingInfoCenterNotifier
       now_playing_info_center_delegate_;
 
   // Tracks current media session state/metadata.
-  media_session::mojom::MediaControllerPtr media_controller_ptr_;
+  mojo::Remote<media_session::mojom::MediaController> media_controller_;
   media_session::mojom::MediaSessionInfoPtr session_info_;
 
   // Used to receive updates to the active media controller.

content/browser/media/system_media_controls_notifier.cc

@@ -62,15 +62,15 @@ void SystemMediaControlsNotifier::Initialize() {
   connector_->BindInterface(media_session::mojom::kServiceName,
                             mojo::MakeRequest(&controller_manager_ptr));
   controller_manager_ptr->CreateActiveMediaController(
-      mojo::MakeRequest(&media_controller_ptr_));
+      media_controller_.BindNewPipeAndPassReceiver());
 
   // Observe the active media controller for changes to playback state and
   // supported actions.
-  media_controller_ptr_->AddObserver(
+  media_controller_->AddObserver(
       media_controller_observer_receiver_.BindNewPipeAndPassRemote());
 
   // Observe the active media controller for changes to provided artwork.
-  media_controller_ptr_->ObserveImages(
+  media_controller_->ObserveImages(
       media_session::mojom::MediaSessionImageType::kArtwork, kMinImageSize,
       kDesiredImageSize,
       media_controller_image_observer_receiver_.BindNewPipeAndPassRemote());

content/browser/media/system_media_controls_notifier.h

@@ -11,8 +11,8 @@
 #include "base/sequence_checker.h"
 #include "base/timer/timer.h"
 #include "content/common/content_export.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/public/mojom/media_controller.mojom.h"
 
 namespace system_media_controls {
@@ -90,7 +90,7 @@ class CONTENT_EXPORT SystemMediaControlsNotifier
   service_manager::Connector* connector_;
 
   // Tracks current media session state/metadata.
-  media_session::mojom::MediaControllerPtr media_controller_ptr_;
+  mojo::Remote<media_session::mojom::MediaController> media_controller_;
   media_session::mojom::MediaSessionInfoPtr session_info_ptr_;
 
   // Used to receive updates to the active media controller.

services/media_session/media_controller.cc

@@ -32,7 +32,7 @@ class MediaController::ImageObserverHolder {
         observer_(std::move(observer)) {
     // Set a connection error handler so that we will remove observers that have
     // had an error / been closed.
-    observer_.set_connection_error_handler(base::BindOnce(
+    observer_.set_disconnect_handler(base::BindOnce(
         &MediaController::CleanupImageObservers, base::Unretained(owner_)));
 
     // Flush the observer with the latest state.
@@ -41,7 +41,7 @@ class MediaController::ImageObserverHolder {
 
   ~ImageObserverHolder() = default;
 
-  bool is_valid() const { return !observer_.encountered_error(); }
+  bool is_valid() const { return observer_.is_connected(); }
 
   mojom::MediaSessionImageType type() const { return type_; }
 
@@ -81,7 +81,7 @@ class MediaController::ImageObserverHolder {
 
   int const desired_size_px_;
 
-  mojom::MediaControllerImageObserverPtr observer_;
+  mojo::Remote<mojom::MediaControllerImageObserver> observer_;
 
   base::WeakPtrFactory<ImageObserverHolder> weak_ptr_factory_{this};