Decouple MediaSession messages from WebContents (full patch)

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
index 365811066e556c685eed2f61288dc6209780f153..8e1b89ee04ee64fdea3fe8687d1557c5c56ce2db 100644
--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
@@ -7,11 +7,9 @@ package org.chromium.content.browser.webcontents;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.WebContentsObserver;
-import org.chromium.content_public.common.MediaMetadata;
 
 /**
  * Serves as a compound observer proxy for dispatching WebContentsObserver callbacks,
@@ -61,14 +59,6 @@ class WebContentsObserverProxy extends WebContentsObserver {
         return !mObservers.isEmpty();
     }
 
-    /**
-     * @return The list of proxied observers.
-     */
-    @VisibleForTesting
-    public ObserverList.RewindableIterator<WebContentsObserver> getObserversForTesting() {
-        return mObservers.rewindableIterator();
-    }
-
     @Override
     @CalledByNative
     public void renderViewReady() {
@@ -248,22 +238,6 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void mediaSessionStateChanged(boolean isControllable, boolean isSuspended) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().mediaSessionStateChanged(isControllable, isSuspended);
-        }
-    }
-
-    @Override
-    @CalledByNative
-    public void mediaSessionMetadataChanged(MediaMetadata metadata) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().mediaSessionMetadataChanged(metadata);
-        }
-    }
-
-    @Override
-    @CalledByNative
     public void destroy() {
         // Super destruction semantics (removing the observer from the
         // Java-based WebContents) are quite different, so we explicitly avoid