Reland "Reland "[Media Session] Convert interface from mojo to CPP""

This is a reland of a656f85 The fix is to remove the include for media_session_service.mojom that has been deleted. Original change's description: > Reland "[Media Session] Convert interface from mojo to CPP" > > This is a reland of 530c8fd > > The fix is to remove the include for media_session_service.mojom > that has been deleted. > > Original change's description: > > [Media Session] Convert interface from mojo to CPP > > > > Context: https://crrev.com/c/2485850 > > > > This converts the MSS interface to CPP since it does > > not need to be mojo. > > > > BUG=1140215 > > > > Change-Id: I595bef21cddf755bc0fb423f87db9e620227d3e6 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503393 > > Commit-Queue: Becca Hughes <beccahughes@chromium.org> > > Reviewed-by: Avi Drissman <avi@chromium.org> > > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#823358} > > Bug: 1140215 > Change-Id: I23a4043529e236174f44377402a8e1fbc5a23600 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518085 > Commit-Queue: Becca Hughes <beccahughes@chromium.org> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> > Reviewed-by: Avi Drissman <avi@chromium.org> > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Cr-Commit-Position: refs/heads/master@{#823718} Bug: 1140215 Change-Id: I4e514807faef4a1fa4374c07661fdd8eb59f2d3c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519716 Commit-Queue: Becca Hughes <beccahughes@chromium.org> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#824205}
marcosholgado · Nov 4, 2020 · c742784 · c742784
1 parent 22f9f16
commit c742784
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 123 deletions.
diff --git a/ash/ambient/ui/media_string_view.cc b/ash/ambient/ui/media_string_view.cc
@@ -17,8 +17,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/prefs/pref_service.h"
+#include "services/media_session/public/cpp/media_session_service.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
@@ -242,7 +242,7 @@ void MediaStringView::InitLayout() {
 }
 
 void MediaStringView::BindMediaControllerObserver() {
-  media_session::mojom::MediaSessionService* service =
+  media_session::MediaSessionService* service =
       Shell::Get()->shell_delegate()->GetMediaSessionService();
   // Service might be unavailable under some test environments.
   if (!service)

diff --git a/ash/login/ui/lock_screen_media_controls_view.cc b/ash/login/ui/lock_screen_media_controls_view.cc
@@ -21,7 +21,7 @@
 #include "components/media_message_center/media_notification_util.h"
 #include "components/vector_icons/vector_icons.h"
 #include "services/media_session/public/cpp/util.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
+#include "services/media_session/public/mojom/media_session.mojom.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -404,7 +404,7 @@ LockScreenMediaControlsView::LockScreenMediaControlsView(
   SetArtwork(base::nullopt);
 
   // |service| can be null in tests.
-  media_session::mojom::MediaSessionService* service =
+  media_session::MediaSessionService* service =
       Shell::Get()->shell_delegate()->GetMediaSessionService();
   if (!service)
     return;

diff --git a/ash/media/media_controller_impl.cc b/ash/media/media_controller_impl.cc
@@ -18,7 +18,6 @@
 #include "media/base/media_switches.h"
 #include "services/media_session/public/mojom/constants.mojom.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "ui/base/accelerators/media_keys_util.h"
 
 namespace ash {
@@ -361,7 +360,7 @@ MediaControllerImpl::GetMediaSessionController() {
   if (!Shell::HasInstance())
     return nullptr;
 
-  media_session::mojom::MediaSessionService* service =
+  media_session::MediaSessionService* service =
       Shell::Get()->shell_delegate()->GetMediaSessionService();
   if (!service)
     return nullptr;

diff --git a/ash/media/media_notification_controller_impl.cc b/ash/media/media_notification_controller_impl.cc
@@ -15,7 +15,6 @@
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "components/media_message_center/media_notification_util.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification_blocker.h"
 #include "ui/message_center/public/cpp/notification.h"
@@ -108,7 +107,7 @@ MediaNotificationControllerImpl::MediaNotificationControllerImpl()
   }
 
   // May be null in tests.
-  media_session::mojom::MediaSessionService* service =
+  media_session::MediaSessionService* service =
       Shell::Get()->shell_delegate()->GetMediaSessionService();
   if (!service)
     return;

diff --git a/ash/shell_delegate.cc b/ash/shell_delegate.cc
@@ -24,8 +24,7 @@ aura::Window* ShellDelegate::CreateBrowserForTabDrop(
   return nullptr;
 }
 
-media_session::mojom::MediaSessionService*
-ShellDelegate::GetMediaSessionService() {
+media_session::MediaSessionService* ShellDelegate::GetMediaSessionService() {
   return nullptr;
 }
 

diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
@@ -15,7 +15,7 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/device/public/mojom/bluetooth_system.mojom-forward.h"
 #include "services/device/public/mojom/fingerprint.mojom-forward.h"
-#include "services/media_session/public/mojom/media_session_service.mojom-forward.h"
+#include "services/media_session/public/cpp/media_session_service.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace aura {
@@ -104,7 +104,7 @@ class ASH_EXPORT ShellDelegate {
 
   // Returns an interface to the Media Session service, or null if not
   // available.
-  virtual media_session::mojom::MediaSessionService* GetMediaSessionService();
+  virtual media_session::MediaSessionService* GetMediaSessionService();
 
   virtual void OpenKeyboardShortcutHelpPage() const {}
 };

diff --git a/ash/system/media/unified_media_controls_controller.cc b/ash/system/media/unified_media_controls_controller.cc
@@ -10,7 +10,6 @@
 #include "base/metrics/histogram_functions.h"
 #include "services/media_session/public/cpp/util.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
@@ -34,7 +33,7 @@ constexpr base::TimeDelta kHideArtworkDelay =
 UnifiedMediaControlsController::UnifiedMediaControlsController(
     Delegate* delegate)
     : delegate_(delegate) {
-  media_session::mojom::MediaSessionService* service =
+  media_session::MediaSessionService* service =
       Shell::Get()->shell_delegate()->GetMediaSessionService();
   // Happens in test.
   if (!service)

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -180,7 +180,7 @@ void ChromeShellDelegate::BindMultiDeviceSetup(
     service->BindMultiDeviceSetup(std::move(receiver));
 }
 
-media_session::mojom::MediaSessionService*
+media_session::MediaSessionService*
 ChromeShellDelegate::GetMediaSessionService() {
   return &content::GetMediaSessionService();
 }

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -42,7 +42,7 @@ class ChromeShellDelegate : public ash::ShellDelegate {
       mojo::PendingReceiver<
           chromeos::multidevice_setup::mojom::MultiDeviceSetup> receiver)
       override;
-  media_session::mojom::MediaSessionService* GetMediaSessionService() override;
+  media_session::MediaSessionService* GetMediaSessionService() override;
   std::unique_ptr<ash::NearbyShareDelegate> CreateNearbyShareDelegate(
       ash::NearbyShareController* controller) const override;
 

diff --git a/content/browser/media/session/media_session_impl_unittest.cc b/content/browser/media/session/media_session_impl_unittest.cc
@@ -203,9 +203,6 @@ TEST_F(MediaSessionImplTest, SessionInfoState) {
     MockMediaSessionMojoObserver observer(*GetMediaSession());
     GetMediaSession()->StartDucking();
     observer.WaitForState(MediaSessionInfo::SessionState::kDucking);
-
-    EXPECT_TRUE(observer.session_info().Equals(
-        media_session::test::GetMediaSessionInfoSync(GetMediaSession())));
   }
 
   {

diff --git a/content/browser/media_session/media_session_service.cc b/content/browser/media_session/media_session_service.cc
@@ -9,36 +9,16 @@
 #include "base/threading/sequence_local_storage_slot.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/media_session/media_session_service.h"
+#include "services/media_session/media_session_service_impl.h"
 #include "services/media_session/public/cpp/features.h"
 
 namespace content {
 
-media_session::mojom::MediaSessionService& GetMediaSessionService() {
+media_session::MediaSessionService& GetMediaSessionService() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // NOTE: We use sequence-local storage here strictly to limit the lifetime of
-  // this Remote to that of the UI-thread sequence. This ensures that it doesn't
-  // persist when the task environment is torn down and reinitialized e.g.
-  // between unit tests.
-  static base::NoDestructor<base::SequenceLocalStorageSlot<
-      mojo::Remote<media_session::mojom::MediaSessionService>>>
-      remote_slot;
-  auto& remote = remote_slot->GetOrCreateValue();
-  if (!remote) {
-    if (base::FeatureList::IsEnabled(
-            media_session::features::kMediaSessionService)) {
-      static base::NoDestructor<
-          std::unique_ptr<media_session::MediaSessionService>>
-          service;
-      *service = std::make_unique<media_session::MediaSessionService>(
-          remote.BindNewPipeAndPassReceiver());
-    } else {
-      // If the service is not enabled, bind to a disconnected pipe.
-      ignore_result(remote.BindNewPipeAndPassReceiver());
-    }
-  }
-  return *remote.get();
+  static base::NoDestructor<media_session::MediaSessionServiceImpl> service;
+  return *service;
 }
 
 }  // namespace content
diff --git a/content/public/browser/media_session_service.h b/content/public/browser/media_session_service.h
@@ -6,14 +6,13 @@
 #define CONTENT_PUBLIC_BROWSER_MEDIA_SESSION_SERVICE_H_
 
 #include "content/common/content_export.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
+#include "services/media_session/public/cpp/media_session_service.h"
 
 namespace content {
 
 // Returns the main control interface into the Media Session Service which runs
 // in the browser process.
-CONTENT_EXPORT media_session::mojom::MediaSessionService&
-GetMediaSessionService();
+CONTENT_EXPORT media_session::MediaSessionService& GetMediaSessionService();
 
 }  // namespace content
 

diff --git a/services/media_session/BUILD.gn b/services/media_session/BUILD.gn
@@ -15,8 +15,8 @@ source_set("lib") {
     "audio_focus_request.h",
     "media_controller.cc",
     "media_controller.h",
-    "media_session_service.cc",
-    "media_session_service.h",
+    "media_session_service_impl.cc",
+    "media_session_service_impl.h",
   ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -36,7 +36,7 @@ source_set("tests") {
   sources = [
     "audio_focus_manager_unittest.cc",
     "media_controller_unittest.cc",
-    "media_session_service_unittest.cc",
+    "media_session_service_impl_unittest.cc",
   ]
 
   deps = [

diff --git a/services/media_session/audio_focus_manager_unittest.cc b/services/media_session/audio_focus_manager_unittest.cc
@@ -17,12 +17,11 @@
 #include "build/chromeos_buildflags.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/audio_focus_request.h"
-#include "services/media_session/media_session_service.h"
+#include "services/media_session/media_session_service_impl.h"
 #include "services/media_session/public/cpp/test/audio_focus_test_util.h"
 #include "services/media_session/public/cpp/test/mock_media_session.h"
 #include "services/media_session/public/mojom/audio_focus.mojom.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media_session {
@@ -48,13 +47,12 @@ class AudioFocusManagerTest
     base::PowerMonitor::Initialize(std::move(power_source));
 
     // Create an instance of the MediaSessionService.
-    service_ = std::make_unique<MediaSessionService>(
-        service_remote_.BindNewPipeAndPassReceiver());
-    service_remote_->BindAudioFocusManager(
+    service_ = std::make_unique<MediaSessionServiceImpl>();
+    service_->BindAudioFocusManager(
         audio_focus_remote_.BindNewPipeAndPassReceiver());
-    service_remote_->BindAudioFocusManagerDebug(
+    service_->BindAudioFocusManagerDebug(
         audio_focus_debug_remote_.BindNewPipeAndPassReceiver());
-    service_remote_->BindMediaControllerManager(
+    service_->BindMediaControllerManager(
         controller_manager_remote_.BindNewPipeAndPassReceiver());
 
     audio_focus_remote_->SetEnforcementMode(GetParam());
@@ -66,7 +64,6 @@ class AudioFocusManagerTest
     base::RunLoop().RunUntilIdle();
 
     service_.reset();
-    service_remote_.reset();
     base::PowerMonitor::ShutdownForTesting();
   }
 
@@ -184,7 +181,7 @@ class AudioFocusManagerTest
 
   mojo::Remote<mojom::AudioFocusManager> CreateAudioFocusManagerRemote() {
     mojo::Remote<mojom::AudioFocusManager> remote;
-    service_remote_->BindAudioFocusManager(remote.BindNewPipeAndPassReceiver());
+    service_->BindAudioFocusManager(remote.BindNewPipeAndPassReceiver());
     return remote;
   }
 
@@ -282,8 +279,7 @@ class AudioFocusManagerTest
 
   base::test::TaskEnvironment task_environment_;
 
-  std::unique_ptr<MediaSessionService> service_;
-  mojo::Remote<mojom::MediaSessionService> service_remote_;
+  std::unique_ptr<MediaSessionServiceImpl> service_;
 
   mojo::Remote<mojom::AudioFocusManager> audio_focus_remote_;
   mojo::Remote<mojom::AudioFocusManagerDebug> audio_focus_debug_remote_;

diff --git a/services/media_session/media_controller_unittest.cc b/services/media_session/media_controller_unittest.cc
@@ -14,13 +14,12 @@
 #include "base/time/time.h"
 #include "base/unguessable_token.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/media_session/media_session_service.h"
+#include "services/media_session/media_session_service_impl.h"
 #include "services/media_session/public/cpp/media_metadata.h"
 #include "services/media_session/public/cpp/test/mock_media_session.h"
 #include "services/media_session/public/cpp/test/test_media_controller.h"
 #include "services/media_session/public/mojom/constants.mojom.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
-#include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media_session {
@@ -31,11 +30,10 @@ class MediaControllerTest : public testing::Test {
 
   void SetUp() override {
     // Create an instance of the MediaSessionService and bind some interfaces.
-    service_ = std::make_unique<MediaSessionService>(
-        service_remote_.BindNewPipeAndPassReceiver());
-    service_remote_->BindAudioFocusManager(
+    service_ = std::make_unique<MediaSessionServiceImpl>();
+    service_->BindAudioFocusManager(
         audio_focus_remote_.BindNewPipeAndPassReceiver());
-    service_remote_->BindMediaControllerManager(
+    service_->BindMediaControllerManager(
         controller_manager_remote_.BindNewPipeAndPassReceiver());
 
     controller_manager_remote_->CreateActiveMediaController(
@@ -72,7 +70,6 @@ class MediaControllerTest : public testing::Test {
  private:
   base::test::TaskEnvironment task_environment_;
   std::unique_ptr<MediaSessionService> service_;
-  mojo::Remote<mojom::MediaSessionService> service_remote_;
   mojo::Remote<mojom::AudioFocusManager> audio_focus_remote_;
   mojo::Remote<mojom::MediaController> media_controller_remote_;
   mojo::Remote<mojom::MediaControllerManager> controller_manager_remote_;

diff --git a/...es/media_session/media_session_service.cc → ...dia_session/media_session_service_impl.cc b/...es/media_session/media_session_service.cc → ...dia_session/media_session_service_impl.cc
@@ -2,31 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/media_session/media_session_service.h"
+#include "services/media_session/media_session_service_impl.h"
 
 #include "base/bind.h"
 #include "services/media_session/audio_focus_manager.h"
 
 namespace media_session {
 
-MediaSessionService::MediaSessionService(
-    mojo::PendingReceiver<mojom::MediaSessionService> receiver)
-    : receiver_(this, std::move(receiver)),
-      audio_focus_manager_(std::make_unique<AudioFocusManager>()) {}
+MediaSessionServiceImpl::MediaSessionServiceImpl()
+    : audio_focus_manager_(std::make_unique<AudioFocusManager>()) {}
 
-MediaSessionService::~MediaSessionService() = default;
+MediaSessionServiceImpl::~MediaSessionServiceImpl() = default;
 
-void MediaSessionService::BindAudioFocusManager(
+void MediaSessionServiceImpl::BindAudioFocusManager(
     mojo::PendingReceiver<mojom::AudioFocusManager> receiver) {
   audio_focus_manager_->BindToInterface(std::move(receiver));
 }
 
-void MediaSessionService::BindAudioFocusManagerDebug(
+void MediaSessionServiceImpl::BindAudioFocusManagerDebug(
     mojo::PendingReceiver<mojom::AudioFocusManagerDebug> receiver) {
   audio_focus_manager_->BindToDebugInterface(std::move(receiver));
 }
 
-void MediaSessionService::BindMediaControllerManager(
+void MediaSessionServiceImpl::BindMediaControllerManager(
     mojo::PendingReceiver<mojom::MediaControllerManager> receiver) {
   audio_focus_manager_->BindToControllerManagerInterface(std::move(receiver));
 }