Decouple MediaSession messages from WebContents (full patch)

content/browser/web_contents/web_contents_android.h

Index: content/browser/web_contents/web_contents_android.h
diff --git a/content/browser/web_contents/web_contents_android.h b/content/browser/web_contents/web_contents_android.h
index c1d4e6c92d79cd10b1cb737b8f2c4f820a95e604..3ec80a714a39425a15822a958b01e7228ec4fbfc 100644
--- a/content/browser/web_contents/web_contents_android.h
+++ b/content/browser/web_contents/web_contents_android.h
@@ -159,13 +159,6 @@ class CONTENT_EXPORT WebContentsAndroid
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& callback);
 
-  void ResumeMediaSession(JNIEnv* env,
-                          const base::android::JavaParamRef<jobject>& obj);
-  void SuspendMediaSession(JNIEnv* env,
-                           const base::android::JavaParamRef<jobject>& obj);
-  void StopMediaSession(JNIEnv* env,
-                        const base::android::JavaParamRef<jobject>& obj);
-
   base::android::ScopedJavaLocalRef<jstring> GetEncoding(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj) const;
@@ -199,6 +192,9 @@ class CONTENT_EXPORT WebContentsAndroid
                     jboolean bypass_cache,
                     const base::android::JavaParamRef<jobject>& jcallback);
 
+  void SetMediaSession(
+      const base::android::ScopedJavaLocalRef<jobject>& j_media_session);
+
  private:
   RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();