[Media Session] Trigger action on play / pause

At the moment on Android we trigger the kPlay or kPause
actions if they are registered. This moves that logic
a layer down to C++ so it will work for keyboard
controls too.

BUG=894255

Change-Id: I0eae3ac51b7d772643ab2a56091e3f0ddb6b2325
Reviewed-on: https://chromium-review.googlesource.com/c/1404178Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622044}

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java

@@ -94,15 +94,9 @@ public class MediaSessionTabHelper implements MediaImageCallback {
             MediaSessionUMA.recordPlay(
                     MediaSessionTabHelper.convertMediaActionSourceToUMA(actionSource));
 
-            if (mMediaSessionObserver.getMediaSession() != null) {
-                if (mMediaSessionActions != null
-                        && mMediaSessionActions.contains(MediaSessionAction.PLAY)) {
-                    mMediaSessionObserver.getMediaSession()
-                            .didReceiveAction(MediaSessionAction.PLAY);
-                } else {
-                    mMediaSessionObserver.getMediaSession().resume();
-                }
-            }
+            if (mMediaSessionObserver.getMediaSession() == null) return;
+
+            mMediaSessionObserver.getMediaSession().resume();
         }
 
         @Override
@@ -112,15 +106,9 @@ public class MediaSessionTabHelper implements MediaImageCallback {
             MediaSessionUMA.recordPause(
                     MediaSessionTabHelper.convertMediaActionSourceToUMA(actionSource));
 
-            if (mMediaSessionObserver.getMediaSession() != null) {
-                if (mMediaSessionActions != null
-                        && mMediaSessionActions.contains(MediaSessionAction.PAUSE)) {
-                    mMediaSessionObserver.getMediaSession()
-                            .didReceiveAction(MediaSessionAction.PAUSE);
-                } else {
-                    mMediaSessionObserver.getMediaSession().suspend();
-                }
-            }
+            if (mMediaSessionObserver.getMediaSession() == null) return;
+
+            mMediaSessionObserver.getMediaSession().suspend();
         }
 
         @Override

content/browser/media/session/media_session_impl.cc

@@ -402,6 +402,13 @@ void MediaSessionImpl::Resume(SuspendType suspend_type) {
     return;
 
   if (suspend_type == SuspendType::kUI) {
+    // If the site has registered an action handler for play then we should
+    // pass it to the site and let them handle it.
+    if (IsActionSupported(media_session::mojom::MediaSessionAction::kPlay)) {
+      DidReceiveAction(media_session::mojom::MediaSessionAction::kPlay);
+      return;
+    }
+
     MediaSessionUmaHelper::RecordMediaSessionUserAction(
         MediaSessionUmaHelper::MediaSessionUserAction::PlayDefault);
   }
@@ -431,6 +438,13 @@ void MediaSessionImpl::Suspend(SuspendType suspend_type) {
     return;
 
   if (suspend_type == SuspendType::kUI) {
+    // If the site has registered an action handler for pause then we should
+    // pass it to the site and let them handle it.
+    if (IsActionSupported(media_session::mojom::MediaSessionAction::kPause)) {
+      DidReceiveAction(media_session::mojom::MediaSessionAction::kPause);
+      return;
+    }
+
     MediaSessionUmaHelper::RecordMediaSessionUserAction(
         MediaSessionUserAction::PauseDefault);
   }

content/browser/media/session/media_session_impl_browsertest.cc

@@ -16,9 +16,9 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "content/browser/media/session/audio_focus_delegate.h"
-#include "content/browser/media/session/media_session_service_impl.h"
 #include "content/browser/media/session/mock_media_session_observer.h"
 #include "content/browser/media/session/mock_media_session_player_observer.h"
+#include "content/browser/media/session/mock_media_session_service_impl.h"
 #include "content/public/browser/media_session.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/content_browser_test.h"
@@ -96,13 +96,6 @@ class MockAudioFocusDelegate : public AudioFocusDelegate {
   base::Optional<AudioFocusType> audio_focus_type_;
 };
 
-class MockMediaSessionServiceImpl : public content::MediaSessionServiceImpl {
- public:
-  explicit MockMediaSessionServiceImpl(content::RenderFrameHost* rfh)
-      : MediaSessionServiceImpl(rfh) {}
-  ~MockMediaSessionServiceImpl() override = default;
-};
-
 }  // namespace
 
 class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
@@ -197,8 +190,9 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
   void SystemStopDucking() { media_session_->StopDucking(); }
 
   void EnsureMediaSessionService() {
-    mock_media_session_service_.reset(new NiceMock<MockMediaSessionServiceImpl>(
-        shell()->web_contents()->GetMainFrame()));
+    mock_media_session_service_.reset(
+        new NiceMock<content::MockMediaSessionServiceImpl>(
+            shell()->web_contents()->GetMainFrame()));
   }
 
   void SetPlaybackState(blink::mojom::MediaSessionPlaybackState state) {
@@ -246,7 +240,8 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
   std::unique_ptr<content::MockMediaSessionObserver>
       mock_media_session_observer_;
   MockAudioFocusDelegate* mock_audio_focus_delegate_;
-  std::unique_ptr<MockMediaSessionServiceImpl> mock_media_session_service_;
+  std::unique_ptr<content::MockMediaSessionServiceImpl>
+      mock_media_session_service_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSessionImplBrowserTest);
 };

content/browser/media/session/media_session_impl_service_routing_unittest.cc

@@ -11,8 +11,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/media/session/media_session_player_observer.h"
-#include "content/browser/media/session/media_session_service_impl.h"
 #include "content/browser/media/session/mock_media_session_observer.h"
+#include "content/browser/media/session/mock_media_session_service_impl.h"
 #include "content/public/test/test_service_manager_context.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
@@ -37,32 +37,6 @@ constexpr base::TimeDelta kDefaultSeekTime =
 
 static const int kPlayerId = 0;
 
-class MockMediaSessionServiceImpl : public MediaSessionServiceImpl {
- public:
-  explicit MockMediaSessionServiceImpl(RenderFrameHost* rfh)
-      : MediaSessionServiceImpl(rfh) {}
-  ~MockMediaSessionServiceImpl() override = default;
-};
-
-class MockMediaSessionClient : public blink::mojom::MediaSessionClient {
- public:
-  MockMediaSessionClient() : binding_(this) {}
-
-  blink::mojom::MediaSessionClientPtr CreateInterfacePtrAndBind() {
-    blink::mojom::MediaSessionClientPtr client;
-    binding_.Bind(mojo::MakeRequest(&client));
-    return client;
-  }
-
-  MOCK_METHOD1(DidReceiveAction,
-               void(media_session::mojom::MediaSessionAction action));
-
- private:
-  mojo::Binding<blink::mojom::MediaSessionClient> binding_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockMediaSessionClient);
-};
-
 class MockMediaSessionPlayerObserver : public MediaSessionPlayerObserver {
  public:
   explicit MockMediaSessionPlayerObserver(RenderFrameHost* rfh)
@@ -109,7 +83,6 @@ class MediaSessionImplServiceRoutingTest
   void TearDown() override {
     mock_media_session_observer_.reset();
     services_.clear();
-    clients_.clear();
 
     test_service_manager_context_.reset();
     RenderViewHostImplTestHarness::TearDown();
@@ -123,18 +96,16 @@ class MediaSessionImplServiceRoutingTest
   void CreateServiceForFrame(TestRenderFrameHost* frame) {
     services_[frame] =
         std::make_unique<NiceMock<MockMediaSessionServiceImpl>>(frame);
-    clients_[frame] = std::make_unique<NiceMock<MockMediaSessionClient>>();
-    services_[frame]->SetClient(clients_[frame]->CreateInterfacePtrAndBind());
   }
 
   void DestroyServiceForFrame(TestRenderFrameHost* frame) {
     services_.erase(frame);
-    clients_.erase(frame);
   }
 
   MockMediaSessionClient* GetClientForFrame(TestRenderFrameHost* frame) {
-    auto iter = clients_.find(frame);
-    return (iter != clients_.end()) ? iter->second.get() : nullptr;
+    auto iter = services_.find(frame);
+    return (iter != services_.end()) ? &iter->second.get()->mock_client()
+                                     : nullptr;
   }
 
   void StartPlayerForFrame(TestRenderFrameHost* frame) {
@@ -176,10 +147,6 @@ class MediaSessionImplServiceRoutingTest
                               std::unique_ptr<MockMediaSessionServiceImpl>>;
   ServiceMap services_;
 
-  using ClientMap =
-      std::map<TestRenderFrameHost*, std::unique_ptr<MockMediaSessionClient>>;
-  ClientMap clients_;
-
   using PlayerMap = std::map<TestRenderFrameHost*,
                              std::unique_ptr<MockMediaSessionPlayerObserver>>;
   PlayerMap players_;

content/browser/media/session/media_session_impl_uma_unittest.cc

@@ -10,6 +10,7 @@
 #include "base/metrics/histogram_samples.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "content/browser/media/session/media_session_player_observer.h"
+#include "content/browser/media/session/mock_media_session_service_impl.h"
 #include "content/public/test/test_service_manager_context.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
@@ -77,9 +78,14 @@ class MediaSessionImplUmaTest : public RenderViewHostImplTestHarness {
 
     contents()->GetMainFrame()->InitializeRenderFrameIfNeeded();
     StartPlayer();
+
+    mock_media_session_service_.reset(
+        new testing::NiceMock<MockMediaSessionServiceImpl>(
+            contents()->GetMainFrame()));
   }
 
   void TearDown() override {
+    mock_media_session_service_.reset();
     test_service_manager_context_.reset();
     RenderViewHostImplTestHarness::TearDown();
   }
@@ -99,6 +105,7 @@ class MediaSessionImplUmaTest : public RenderViewHostImplTestHarness {
     return histogram_tester_.GetHistogramSamplesSinceCreation(name);
   }
 
+  std::unique_ptr<MockMediaSessionServiceImpl> mock_media_session_service_;
   std::unique_ptr<MockMediaSessionPlayerObserver> player_;
   base::HistogramTester histogram_tester_;
 
@@ -116,6 +123,19 @@ TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnUISuspend) {
                    MediaSessionUserAction::PauseDefault)));
 }
 
+TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnUISuspendWithAction) {
+  mock_media_session_service_->EnableAction(
+      media_session::mojom::MediaSessionAction::kPause);
+
+  GetSession()->Suspend(SuspendType::kUI);
+
+  std::unique_ptr<base::HistogramSamples> samples(
+      GetHistogramSamplesSinceTestStart("Media.Session.UserAction"));
+  EXPECT_EQ(1, samples->TotalCount());
+  EXPECT_EQ(1, samples->GetCount(static_cast<base::HistogramBase::Sample>(
+                   MediaSessionUserAction::Pause)));
+}
+
 TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnSystemSuspend) {
   GetSession()->Suspend(SuspendType::kSystem);
   std::unique_ptr<base::HistogramSamples> samples(
@@ -140,6 +160,20 @@ TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnUIResume) {
                    MediaSessionUserAction::PlayDefault)));
 }
 
+TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnUIResumeWithAction) {
+  mock_media_session_service_->EnableAction(
+      media_session::mojom::MediaSessionAction::kPlay);
+
+  GetSession()->Suspend(SuspendType::kSystem);
+  GetSession()->Resume(SuspendType::kUI);
+
+  std::unique_ptr<base::HistogramSamples> samples(
+      GetHistogramSamplesSinceTestStart("Media.Session.UserAction"));
+  EXPECT_EQ(1, samples->TotalCount());
+  EXPECT_EQ(1, samples->GetCount(static_cast<base::HistogramBase::Sample>(
+                   MediaSessionUserAction::Play)));
+}
+
 TEST_F(MediaSessionImplUmaTest, RecordPauseDefaultOnSystemResume) {
   GetSession()->Suspend(SuspendType::kSystem);
   GetSession()->Resume(SuspendType::kSystem);

content/browser/media/session/media_session_service_impl.cc

@@ -51,6 +51,10 @@ void MediaSessionServiceImpl::DidFinishNavigation() {
   ClearActions();
 }
 
+void MediaSessionServiceImpl::FlushForTesting() {
+  client_.FlushForTesting();
+}
+
 void MediaSessionServiceImpl::SetClient(
     blink::mojom::MediaSessionClientPtr client) {
   client_ = std::move(client);

content/browser/media/session/media_session_service_impl.h

@@ -42,6 +42,7 @@ class CONTENT_EXPORT MediaSessionServiceImpl
   }
 
   void DidFinishNavigation();
+  void FlushForTesting();
 
   // blink::mojom::MediaSessionService implementation.
   void SetClient(blink::mojom::MediaSessionClientPtr client) override;

content/browser/media/session/mock_media_session_service_impl.cc

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/media/session/mock_media_session_service_impl.h"
+
+namespace content {
+
+MockMediaSessionClient::MockMediaSessionClient() = default;
+
+MockMediaSessionClient::~MockMediaSessionClient() = default;
+
+blink::mojom::MediaSessionClientPtr
+MockMediaSessionClient::CreateInterfacePtrAndBind() {
+  blink::mojom::MediaSessionClientPtr client;
+  binding_.Bind(mojo::MakeRequest(&client));
+  return client;
+}
+
+MockMediaSessionServiceImpl::MockMediaSessionServiceImpl(
+    content::RenderFrameHost* rfh)
+    : MediaSessionServiceImpl(rfh) {
+  SetClient(mock_client_.CreateInterfacePtrAndBind());
+}
+
+MockMediaSessionServiceImpl::~MockMediaSessionServiceImpl() = default;
+
+}  // namespace content

content/browser/media/session/mock_media_session_service_impl.h

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_BROWSER_MEDIA_SESSION_MOCK_MEDIA_SESSION_SERVICE_IMPL_H_
+#define CONTENT_BROWSER_MEDIA_SESSION_MOCK_MEDIA_SESSION_SERVICE_IMPL_H_
+
+#include "content/browser/media/session/media_session_service_impl.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/blink/public/platform/modules/mediasession/media_session.mojom.h"
+
+namespace content {
+
+class MockMediaSessionClient : public blink::mojom::MediaSessionClient {
+ public:
+  MockMediaSessionClient();
+  ~MockMediaSessionClient() override;
+
+  blink::mojom::MediaSessionClientPtr CreateInterfacePtrAndBind();
+
+  MOCK_METHOD1(DidReceiveAction,
+               void(media_session::mojom::MediaSessionAction action));
+
+ private:
+  mojo::Binding<blink::mojom::MediaSessionClient> binding_{this};
+
+  DISALLOW_COPY_AND_ASSIGN(MockMediaSessionClient);
+};
+
+class MockMediaSessionServiceImpl : public content::MediaSessionServiceImpl {
+ public:
+  explicit MockMediaSessionServiceImpl(content::RenderFrameHost* rfh);
+  ~MockMediaSessionServiceImpl() override;
+
+  MockMediaSessionClient& mock_client() { return mock_client_; }
+
+ private:
+  MockMediaSessionClient mock_client_;
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_MEDIA_SESSION_MOCK_MEDIA_SESSION_SERVICE_IMPL_H_

content/test/BUILD.gn

@@ -53,6 +53,8 @@ jumbo_static_library("test_support") {
     "../browser/media/session/mock_media_session_observer.h",
     "../browser/media/session/mock_media_session_player_observer.cc",
     "../browser/media/session/mock_media_session_player_observer.h",
+    "../browser/media/session/mock_media_session_service_impl.cc",
+    "../browser/media/session/mock_media_session_service_impl.h",
     "../browser/service_worker/embedded_worker_test_helper.cc",
     "../browser/service_worker/embedded_worker_test_helper.h",
     "../browser/service_worker/service_worker_test_utils.cc",