Allow MediaSession in iframes to be routed

content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java

 // Copyright 2016 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.content.browser;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.MediaSession;
 import org.chromium.content_public.browser.MediaSessionObserver;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.MediaMetadata;
 
+import java.util.HashSet;
+
 /**
  * The MediaSessionImpl Java wrapper to allow communicating with the native MediaSessionImpl object.
  * The object is owned by Java WebContentsImpl instead of native to avoid introducing a new garbage
  * collection root.
  */
 @JNINamespace("content")
 public class MediaSessionImpl extends MediaSession {
     private long mNativeMediaSessionAndroid;
 
     private ObserverList<MediaSessionObserver> mObservers;
@@ skipping 61 matching lines @@
     }
 
     @CalledByNative
     private void mediaSessionMetadataChanged(MediaMetadata metadata) {
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
             mObserversIterator.next().mediaSessionMetadataChanged(metadata);
         }
     }
 
     @CalledByNative
-    private void mediaSessionEnabledAction(int action) {
+    private void mediaSessionActionsChanged(int[] actions) {
+        HashSet<Integer> actionSet = new HashSet<Integer>();
+        for (int action : actions) actionSet.add(action);
+
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().mediaSessionEnabledAction(action);
+            mObserversIterator.next().mediaSessionActionsChanged(actionSet);
         }
     }
 
-    @CalledByNative
-    private void mediaSessionDisabledAction(int action) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().mediaSessionDisabledAction(action);
-        }
-    }
-
     @CalledByNative
     private static MediaSessionImpl create(long nativeMediaSession) {
         return new MediaSessionImpl(nativeMediaSession);
     }
 
     private MediaSessionImpl(long nativeMediaSession) {
         mNativeMediaSessionAndroid = nativeMediaSession;
         mObservers = new ObserverList<MediaSessionObserver>();
         mObserversIterator = mObservers.rewindableIterator();
     }
 
     private native void nativeResume(long nativeMediaSessionAndroid);
     private native void nativeSuspend(long nativeMediaSessionAndroid);
     private native void nativeStop(long nativeMediaSessionAndroid);
     private native void nativeDidReceiveAction(long nativeMediaSessionAndroid, int action);
     private static native MediaSessionImpl nativeGetMediaSessionFromWebContents(
             WebContents contents);
 }