[Media Keys] Add handling for Media Play

Unlike most keyboards, which have a single Play/Pause toggle key,
Bluetooth devices with AVRCP (Audio/Video Remote Control Profile)
generate separate Play and Pause key events based on the media status.
This patch adds handling for the Play media key.

BUG=b/147364135

Change-Id: Ie3cbc4c02ceab8e317f79d089eb8b163aa3ed658
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062941Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Commit-Queue: Michael Sun <michaelfsun@google.com>
Cr-Commit-Position: refs/heads/master@{#742767}

ash/media/media_controller_impl.cc

@@ -127,6 +127,31 @@ void MediaControllerImpl::HandleMediaPlayPause() {
     client_->HandleMediaPlayPause();
 }
 
+void MediaControllerImpl::HandleMediaPlay() {
+  if (Shell::Get()->session_controller()->IsScreenLocked() &&
+      !AreLockScreenMediaKeysEnabled()) {
+    return;
+  }
+
+  ui::RecordMediaHardwareKeyAction(ui::MediaHardwareKeyAction::kPlay);
+
+  // If the |client_| is force handling the keys then we should forward them.
+  if (client_ && force_media_client_key_handling_) {
+    client_->HandleMediaPlay();
+    return;
+  }
+
+  // If media session media key handling is enabled. Fire play using the media
+  // session service.
+  if (ShouldUseMediaSession()) {
+    GetMediaSessionController()->Resume();
+    return;
+  }
+
+  if (client_)
+    client_->HandleMediaPlay();
+}
+
 void MediaControllerImpl::HandleMediaNextTrack() {
   if (Shell::Get()->session_controller()->IsScreenLocked() &&
       !AreLockScreenMediaKeysEnabled()) {

ash/media/media_controller_impl.h

@@ -60,6 +60,7 @@ class ASH_EXPORT MediaControllerImpl
   // media session service to control playback. Otherwise it will forward to
   // |client_|.
   void HandleMediaPlayPause();
+  void HandleMediaPlay();
   void HandleMediaNextTrack();
   void HandleMediaPrevTrack();
 

ash/media/media_controller_unittest.cc

@@ -72,6 +72,8 @@ class MediaControllerTest : public AshTestBase {
   void HandleMediaKeys() {
     Shell::Get()->media_controller()->HandleMediaPlayPause();
     Flush();
+    Shell::Get()->media_controller()->HandleMediaPlay();
+    Flush();
     Shell::Get()->media_controller()->HandleMediaPrevTrack();
     Flush();
     Shell::Get()->media_controller()->HandleMediaNextTrack();
@@ -86,12 +88,14 @@ class MediaControllerTest : public AshTestBase {
 
 TEST_F(MediaControllerTest, EnableMediaKeysWhenUnlocked) {
   EXPECT_EQ(0, controller()->suspend_count());
+  EXPECT_EQ(0, controller()->resume_count());
   EXPECT_EQ(0, controller()->previous_track_count());
   EXPECT_EQ(0, controller()->next_track_count());
 
   HandleMediaKeys();
 
   EXPECT_EQ(1, controller()->suspend_count());
+  EXPECT_EQ(1, controller()->resume_count());
   EXPECT_EQ(1, controller()->previous_track_count());
   EXPECT_EQ(1, controller()->next_track_count());
 }
@@ -146,6 +150,7 @@ TEST_F(MediaControllerTest, EnableMediaKeysWhenLockedAndControlsEnabled) {
   prefs->SetBoolean(prefs::kLockScreenMediaControlsEnabled, true);
 
   EXPECT_EQ(0, controller()->suspend_count());
+  EXPECT_EQ(0, controller()->resume_count());
   EXPECT_EQ(0, controller()->previous_track_count());
   EXPECT_EQ(0, controller()->next_track_count());
 
@@ -154,6 +159,7 @@ TEST_F(MediaControllerTest, EnableMediaKeysWhenLockedAndControlsEnabled) {
   HandleMediaKeys();
 
   EXPECT_EQ(1, controller()->suspend_count());
+  EXPECT_EQ(1, controller()->resume_count());
   EXPECT_EQ(1, controller()->previous_track_count());
   EXPECT_EQ(1, controller()->next_track_count());
 }
@@ -164,6 +170,7 @@ TEST_F(MediaControllerTest, DisableMediaKeysWhenLockedAndControlsDisabled) {
   prefs->SetBoolean(prefs::kLockScreenMediaControlsEnabled, false);
 
   EXPECT_EQ(0, controller()->suspend_count());
+  EXPECT_EQ(0, controller()->resume_count());
   EXPECT_EQ(0, controller()->previous_track_count());
   EXPECT_EQ(0, controller()->next_track_count());
 
@@ -172,6 +179,7 @@ TEST_F(MediaControllerTest, DisableMediaKeysWhenLockedAndControlsDisabled) {
   HandleMediaKeys();
 
   EXPECT_EQ(0, controller()->suspend_count());
+  EXPECT_EQ(0, controller()->resume_count());
   EXPECT_EQ(0, controller()->previous_track_count());
   EXPECT_EQ(0, controller()->next_track_count());
 }

ash/public/cpp/media_client.h

@@ -18,6 +18,9 @@ class ASH_PUBLIC_EXPORT MediaClient {
   // Handles the Play/Pause Toggle Media shortcut key.
   virtual void HandleMediaPlayPause() = 0;
 
+  // Handles the Play Media shortcut key.
+  virtual void HandleMediaPlay() = 0;
+
   // Handles the Previous Track Media shortcut key.
   virtual void HandleMediaPrevTrack() = 0;
 

ash/test_media_client.cc

@@ -17,6 +17,10 @@ void TestMediaClient::HandleMediaPlayPause() {
   ++handle_media_play_pause_count_;
 }
 
+void TestMediaClient::HandleMediaPlay() {
+  ++handle_media_play_count_;
+}
+
 void TestMediaClient::HandleMediaPrevTrack() {
   ++handle_media_prev_track_count_;
 }

ash/test_media_client.h

@@ -20,6 +20,7 @@ class TestMediaClient : public MediaClient {
   // MediaClient:
   void HandleMediaNextTrack() override;
   void HandleMediaPlayPause() override;
+  void HandleMediaPlay() override;
   void HandleMediaPrevTrack() override;
   void RequestCaptureState() override;
   void SuspendMediaSessions() override;
@@ -30,6 +31,7 @@ class TestMediaClient : public MediaClient {
   int handle_media_play_pause_count() const {
     return handle_media_play_pause_count_;
   }
+  int handle_media_play_count() const { return handle_media_play_count_; }
   int handle_media_prev_track_count() const {
     return handle_media_prev_track_count_;
   }
@@ -38,6 +40,7 @@ class TestMediaClient : public MediaClient {
  private:
   int handle_media_next_track_count_ = 0;
   int handle_media_play_pause_count_ = 0;
+  int handle_media_play_count_ = 0;
   int handle_media_prev_track_count_ = 0;
   bool media_sessions_suspended_ = false;
 

chrome/browser/ui/ash/media_client_impl.cc

@@ -181,6 +181,10 @@ void MediaClientImpl::HandleMediaPlayPause() {
   HandleMediaAction(ui::VKEY_MEDIA_PLAY_PAUSE);
 }
 
+void MediaClientImpl::HandleMediaPlay() {
+  HandleMediaAction(ui::VKEY_MEDIA_PLAY);
+}
+
 void MediaClientImpl::HandleMediaPrevTrack() {
   HandleMediaAction(ui::VKEY_MEDIA_PREV_TRACK);
 }
@@ -295,6 +299,9 @@ void MediaClientImpl::HandleMediaAction(ui::KeyboardCode keycode) {
     case ui::VKEY_MEDIA_PLAY_PAUSE:
       router->NotifyTogglePlayState();
       break;
+    // TODO(https://crbug.com/1053777): Handle media action for VKEY_MEDIA_PLAY.
+    case ui::VKEY_MEDIA_PLAY:
+      break;
     default:
       break;
   }

chrome/browser/ui/ash/media_client_impl.h

@@ -37,6 +37,7 @@ class MediaClientImpl : public ash::MediaClient,
   // ash::MediaClient:
   void HandleMediaNextTrack() override;
   void HandleMediaPlayPause() override;
+  void HandleMediaPlay() override;
   void HandleMediaPrevTrack() override;
   void RequestCaptureState() override;
   void SuspendMediaSessions() override;

chrome/browser/ui/ash/media_client_impl_unittest.cc

@@ -167,6 +167,44 @@ TEST_F(MediaClientTest, HandleMediaPlayPause) {
   EXPECT_EQ(base::nullopt, delegate()->ConsumeLastMediaKey());
 }
 
+TEST_F(MediaClientTest, HandleMediaPlay) {
+  const ui::Accelerator test_accelerator(ui::VKEY_MEDIA_PLAY, ui::EF_NONE);
+
+  // Enable custom media key handling for the current browser. Ensure that the
+  // client set the override on the controller.
+  client()->EnableCustomMediaKeyHandler(profile(), delegate());
+  EXPECT_TRUE(controller()->force_media_client_key_handling());
+
+  // Simulate the media key and check that the delegate received it.
+  client()->HandleMediaPlay();
+  EXPECT_EQ(test_accelerator, delegate()->ConsumeLastMediaKey());
+
+  // Change the active browser and ensure the override was disabled.
+  BrowserList::SetLastActive(alt_browser());
+  EXPECT_FALSE(controller()->force_media_client_key_handling());
+
+  // Simulate the media key and check that the delegate did not receive it.
+  client()->HandleMediaPlay();
+  EXPECT_EQ(base::nullopt, delegate()->ConsumeLastMediaKey());
+
+  // Change the active browser back and ensure the override was enabled.
+  BrowserList::SetLastActive(browser());
+  EXPECT_TRUE(controller()->force_media_client_key_handling());
+
+  // Simulate the media key and check the delegate received it.
+  client()->HandleMediaPlay();
+  EXPECT_EQ(test_accelerator, delegate()->ConsumeLastMediaKey());
+
+  // Disable custom media key handling for the current browser and ensure the
+  // override was disabled.
+  client()->DisableCustomMediaKeyHandler(profile(), delegate());
+  EXPECT_FALSE(controller()->force_media_client_key_handling());
+
+  // Simulate the media key and check the delegate did not receive it.
+  client()->HandleMediaPlay();
+  EXPECT_EQ(base::nullopt, delegate()->ConsumeLastMediaKey());
+}
+
 TEST_F(MediaClientTest, HandleMediaNextTrack) {
   const ui::Accelerator test_accelerator(ui::VKEY_MEDIA_NEXT_TRACK,
                                          ui::EF_NONE);