Split MediaSessionStateChanged() and MediaSessionMetadataChanged()

chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java
index 3ebaf1ef11038a31b71f31cd94445a90a66f445d..2720de1e540665438bfceda326ea41156bdd8ae9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java
@@ -70,12 +70,14 @@ public class NotificationTitleUpdatedTest extends ChromeActivityTestCaseBase<Chr
     }
 
     private void doTestMediaMetadataSetsTitle() throws InterruptedException {
-        simulateMediaSessionStateChanged(mTab, true, false, new MediaMetadata("title2", "", ""));
+        simulateMediaSessionStateChanged(mTab, true, false);
+        simulateMediaSessionMetadataChanged(mTab, new MediaMetadata("title2", "", ""));
         assertTitleMatches("title2");
     }
 
     private void doTestMediaMetadataOverridesTitle() throws InterruptedException {
-        simulateMediaSessionStateChanged(mTab, true, false, new MediaMetadata("title2", "", ""));
+        simulateMediaSessionStateChanged(mTab, true, false);
+        simulateMediaSessionMetadataChanged(mTab, new MediaMetadata("title2", "", ""));
         assertTitleMatches("title2");
 
         simulateUpdateTitle(mTab, "title3");
@@ -145,25 +147,31 @@ public class NotificationTitleUpdatedTest extends ChromeActivityTestCaseBase<Chr
 
     private void simulateMediaSessionStateChanged(
             final Tab tab, final boolean isControllable, final boolean isSuspended) {
-        simulateMediaSessionStateChanged(
-                tab, isControllable, isSuspended, new MediaMetadata("", "", ""));
-    }
-
-    private void simulateMediaSessionStateChanged(final Tab tab, final boolean isControllable,
-            final boolean isSuspended, final MediaMetadata metadata) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
                 @Override
                 public void run() {
                     ObserverList.RewindableIterator<WebContentsObserver> observers =
                             tab.getWebContents().getObserversForTesting();
                     while (observers.hasNext()) {
-                        observers.next().mediaSessionStateChanged(
-                                isControllable, isSuspended, metadata);
+                        observers.next().mediaSessionStateChanged(isControllable, isSuspended);
                     }
                 }
             });
     }
 
+    private void simulateMediaSessionMetadataChanged(final Tab tab, final MediaMetadata metadata) {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ObserverList.RewindableIterator<WebContentsObserver> observers =
+                        tab.getWebContents().getObserversForTesting();
+                while (observers.hasNext()) {
+                    observers.next().mediaSessionMetadataChanged(metadata);
+                }
+            }
+        });
+    }
+
     private void simulateUpdateTitle(Tab tab, String title) {
         try {
             TabTitleObserver observer = new TabTitleObserver(tab, title);