Link MediaSessionTabHelper with native MediaSession [CL is going to be split]

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.media.ui;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.app.Notification;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.widget.TextView;
 
-import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
 import org.chromium.chrome.test.util.browser.TabTitleObserver;
+import org.chromium.content.browser.ChromeMediaSession;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
-import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.content_public.common.MediaMetadata;
 
 /**
  * Test of media notifications to see whether the text updates when the tab title changes or the
  * MediaMetadata gets updated.
  */
 @RetryOnFailure
 public class NotificationTitleUpdatedTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final int NOTIFICATION_ID = R.id.media_playback_notification;
 
@@ skipping 105 matching lines @@
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
     private void simulateMediaSessionStateChanged(
             final Tab tab, final boolean isControllable, final boolean isSuspended) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
                 @Override
                 public void run() {
-                    ObserverList.RewindableIterator<WebContentsObserver> observers =
-                            tab.getWebContents().getObserversForTesting();
-                    while (observers.hasNext()) {
-                        observers.next().mediaSessionStateChanged(isControllable, isSuspended);
-                    }
+                    ChromeMediaSession.fromWebContents(tab.getWebContents())
+                            .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);
-                }
+                ChromeMediaSession.fromWebContents(tab.getWebContents())
+                        .mediaSessionMetadataChanged(metadata);
             }
         });
     }
 
     private void simulateUpdateTitle(Tab tab, String title) {
         try {
             TabTitleObserver observer = new TabTitleObserver(tab, title);
             JavaScriptUtils.executeJavaScriptAndWaitForResult(
                     tab.getWebContents(),
                     "document.title = '" + title + "';");
@@ skipping 31 matching lines @@
                         // The TextView id will be in Chrome's namespace.
                         view = (TextView) contentView.findViewById(R.id.title);
                     }
                     observedText = view.getText().toString();
 
                     assertEquals(title, observedText);
                 }
             });
     }
 }