Migrating MediaSession messages to mojo

content/renderer/media/android/webmediasession_android_unittest.cc

Index: content/renderer/media/android/webmediasession_android_unittest.cc
diff --git a/content/renderer/media/android/webmediasession_android_unittest.cc b/content/renderer/media/android/webmediasession_android_unittest.cc
index 0b870bc3a46b00b7a6223dc1ca2b59ddf2f2a2f7..dbcf2686c751f9c928ae9a239ed5982834e454cb 100644
--- a/content/renderer/media/android/webmediasession_android_unittest.cc
+++ b/content/renderer/media/android/webmediasession_android_unittest.cc
@@ -6,18 +6,11 @@
 
 #include <memory>
 
-#include "content/common/media/media_session_messages_android.h"
 #include "content/renderer/media/android/renderer_media_session_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace content {
 
-namespace {
-
-const int kRouteId = 0;
-
-}  // anonymous namespace
-
 class WebMediaSessionTest : public testing::Test {
  public:
   void OnSuccess() { ++success_count_; }
@@ -122,107 +115,20 @@ TEST_F(WebMediaSessionTest, TestMultipleRegistrationOutOfOrder) {
   EXPECT_TRUE(IsSessionManagerEmpty(session_manager.get()));
 }
 
-TEST_F(WebMediaSessionTest, ActivationOutOfOrder) {
-  std::unique_ptr<RendererMediaSessionManager> session_manager(
-      new RendererMediaSessionManager(nullptr));
-
-  std::unique_ptr<WebMediaSessionAndroid> session(
-      new WebMediaSessionAndroid(session_manager.get()));
-
-  // Request activate three times
-  session->activate(new TestActivateCallback(this));  // request 1
-  session->activate(new TestActivateCallback(this));  // request 2
-  session->activate(new TestActivateCallback(this));  // request 3
-
-  // Confirm activation out of order
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 3, true));
-
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 2, true));
-
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 1, true));
-
-  EXPECT_EQ(3, success_count_);
-  EXPECT_EQ(0, error_count_);
-}
-
-TEST_F(WebMediaSessionTest, ActivationInOrder) {
+TEST_F(WebMediaSessionTest, Activation) {
   std::unique_ptr<RendererMediaSessionManager> session_manager(
       new RendererMediaSessionManager(nullptr));
 
   std::unique_ptr<WebMediaSessionAndroid> session(
       new WebMediaSessionAndroid(session_manager.get()));
 
-  // Request activate three times
-  session->activate(new TestActivateCallback(this));  // request 1
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 1, true));
-
-  session->activate(new TestActivateCallback(this));  // request 2
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 2, true));
+  session_manager->OnDidActivate(
+      base::MakeUnique<TestActivateCallback>(this), true);
+  session_manager->OnDidActivate(
+      base::MakeUnique<TestActivateCallback>(this), true);
+  session_manager->OnDidActivate(
+      base::MakeUnique<TestActivateCallback>(this), false);
 
-  session->activate(new TestActivateCallback(this));  // request 3
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 3, true));
-
-  EXPECT_EQ(3, success_count_);
-  EXPECT_EQ(0, error_count_);
-}
-
-TEST_F(WebMediaSessionTest, ActivationInFlight) {
-  std::unique_ptr<RendererMediaSessionManager> session_manager(
-      new RendererMediaSessionManager(nullptr));
-
-  std::unique_ptr<WebMediaSessionAndroid> session(
-      new WebMediaSessionAndroid(session_manager.get()));
-
-  session->activate(new TestActivateCallback(this));  // request 1
-  session->activate(new TestActivateCallback(this));  // request 2
-  session->activate(new TestActivateCallback(this));  // request 3
-
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 1, true));
-
-  session->activate(new TestActivateCallback(this));  // request 4
-  session->activate(new TestActivateCallback(this));  // request 5
-
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 3, true));
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 2, true));
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 5, true));
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 4, true));
-
-  EXPECT_EQ(5, success_count_);
-  EXPECT_EQ(0, error_count_);
-}
-
-TEST_F(WebMediaSessionTest, ActivationFailure) {
-  std::unique_ptr<RendererMediaSessionManager> session_manager(
-      new RendererMediaSessionManager(nullptr));
-
-  std::unique_ptr<WebMediaSessionAndroid> session(
-      new WebMediaSessionAndroid(session_manager.get()));
-
-  session->activate(new TestActivateCallback(this));  // request 1
-  session->activate(new TestActivateCallback(this));  // request 2
-  session->activate(new TestActivateCallback(this));  // request 3
-
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 1, true));
-  EXPECT_EQ(1, success_count_);
-  EXPECT_EQ(0, error_count_);
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 2, false));
-  EXPECT_EQ(1, success_count_);
-  EXPECT_EQ(1, error_count_);
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidActivate(kRouteId, 3, true));
   EXPECT_EQ(2, success_count_);
   EXPECT_EQ(1, error_count_);
 }
@@ -234,18 +140,13 @@ TEST_F(WebMediaSessionTest, Deactivation) {
   std::unique_ptr<WebMediaSessionAndroid> session(
       new WebMediaSessionAndroid(session_manager.get()));
 
-  // Request deactivate three times
-  session->deactivate(new TestDeactivateCallback(this));  // request 1
-  session->deactivate(new TestDeactivateCallback(this));  // request 2
-  session->deactivate(new TestDeactivateCallback(this));  // request 3
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidDeactivate(kRouteId, 1));
-  EXPECT_EQ(1, success_count_);
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidDeactivate(kRouteId, 2));
-  EXPECT_EQ(2, success_count_);
-  session_manager->OnMessageReceived(
-      MediaSessionMsg_DidDeactivate(kRouteId, 3));
+  session_manager->OnDidDeactivate(
+      base::MakeUnique<TestDeactivateCallback>(this));
+  session_manager->OnDidDeactivate(
+      base::MakeUnique<TestDeactivateCallback>(this));
+  session_manager->OnDidDeactivate(
+      base::MakeUnique<TestDeactivateCallback>(this));
+
   EXPECT_EQ(3, success_count_);
   EXPECT_EQ(0, error_count_);
 }