assistant: correctly mark override method

Bug: None
Test: CQ
Change-Id: I64ba530176aa572cd6a2433c15176d0842738f0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109235
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751772}

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -709,11 +709,6 @@ void AssistantManagerServiceImpl::OnOpenUrl(const std::string& url,
     it->OnOpenUrlResponse(gurl, is_background);
 }
 
-void AssistantManagerServiceImpl::OnPlaybackStateChange(
-    const MediaStatus& status) {
-  media_session_->NotifyMediaSessionMetadataChanged(status);
-}
-
 void AssistantManagerServiceImpl::OnShowNotification(
     const action::Notification& notification) {
   ENSURE_MAIN_THREAD(&AssistantManagerServiceImpl::OnShowNotification,
@@ -1338,10 +1333,9 @@ void AssistantManagerServiceImpl::UpdateInternalOptions(
   });
 }
 
-void AssistantManagerServiceImpl::MediaSessionChanged(
-    const base::Optional<base::UnguessableToken>& request_id) {
-  if (request_id.has_value())
-    media_session_audio_focus_id_ = std::move(request_id.value());
+void AssistantManagerServiceImpl::OnPlaybackStateChange(
+    const MediaStatus& status) {
+  media_session_->NotifyMediaSessionMetadataChanged(status);
 }
 
 void AssistantManagerServiceImpl::MediaSessionInfoChanged(
@@ -1356,6 +1350,12 @@ void AssistantManagerServiceImpl::MediaSessionMetadataChanged(
   UpdateMediaState();
 }
 
+void AssistantManagerServiceImpl::MediaSessionChanged(
+    const base::Optional<base::UnguessableToken>& request_id) {
+  if (request_id.has_value())
+    media_session_audio_focus_id_ = std::move(request_id.value());
+}
+
 // TODO(dmblack): Handle non-firing (e.g. paused or scheduled) timers.
 void AssistantManagerServiceImpl::OnAlarmTimerStateChanged() {
   ENSURE_MAIN_THREAD(&AssistantManagerServiceImpl::OnAlarmTimerStateChanged);

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -165,8 +165,6 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
       const std::vector<action::Suggestion>& suggestions) override;
   void OnShowText(const std::string& text) override;
   void OnOpenUrl(const std::string& url, bool in_background) override;
-  void OnPlaybackStateChange(
-      const assistant_client::MediaStatus& status) override;
   void OnShowNotification(const action::Notification& notification) override;
   void OnOpenAndroidApp(const action::AndroidAppInfo& app_info,
                         const action::InteractionInfo& interaction) override;
@@ -216,6 +214,10 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
   }
   CrosPlatformApi* platform_api() { return platform_api_.get(); }
 
+  // assistant_client::MediaManager::Listener overrides:
+  void OnPlaybackStateChange(
+      const assistant_client::MediaStatus& status) override;
+
   // media_session::mojom::MediaControllerObserver overrides:
   void MediaSessionInfoChanged(
       media_session::mojom::MediaSessionInfoPtr info) override;