Allow MediaSession in iframes to be routed

content/browser/media/session/media_session_android.cc

 // 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.
 
 #include "content/browser/media/session/media_session_android.h"
 
 #include <algorithm>
+
+#include "base/android/jni_array.h"
 #include "content/browser/media/session/media_session_impl.h"
 #include "content/browser/web_contents/web_contents_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/android/media_metadata_android.h"
 #include "content/public/browser/media_session.h"
 #include "jni/MediaSessionImpl_jni.h"
 
 namespace content {
 
 using base::android::JavaParamRef;
@@ skipping 78 matching lines @@
   if (!Java_MediaSessionImpl_hasObservers(env, j_local_session))
     return;
 
   ScopedJavaLocalRef<jobject> j_metadata;
   if (metadata.has_value())
     j_metadata = MediaMetadataAndroid::CreateJavaObject(env, metadata.value());
   Java_MediaSessionImpl_mediaSessionMetadataChanged(env, j_local_session,
                                                     j_metadata);
 }
 
-void MediaSessionAndroid::MediaSessionEnabledAction(
-    blink::mojom::MediaSessionAction action) {
+void MediaSessionAndroid::MediaSessionActionsChanged(
+    const std::set<blink::mojom::MediaSessionAction>& actions) {
   ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
   if (j_local_session.is_null())
     return;
 
+  std::vector<int> actions_vec;
+  std::transform(actions.begin(), actions.end(), actions_vec.begin(),
+                 [](blink::mojom::MediaSessionAction action) {
+                   return static_cast<int>(action);
+                 });
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_MediaSessionImpl_mediaSessionEnabledAction(env, j_local_session,
-                                                  static_cast<int>(action));
-}
-
-void MediaSessionAndroid::MediaSessionDisabledAction(
-    blink::mojom::MediaSessionAction action) {
-  ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
-  if (j_local_session.is_null())
-    return;
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_MediaSessionImpl_mediaSessionDisabledAction(env, j_local_session,
-                                                   static_cast<int>(action));
+  Java_MediaSessionImpl_mediaSessionActionsChanged(
+      env, j_local_session, base::android::ToJavaIntArray(env, actions_vec));
 }
 
 void MediaSessionAndroid::Resume(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& j_obj) {
   DCHECK(media_session());
   media_session()->Resume(MediaSession::SuspendType::UI);
 }
 
 void MediaSessionAndroid::Suspend(
@@ skipping 27 matching lines @@
     return nullptr;
   return contents->GetWebContentsAndroid();
 }
 
 ScopedJavaLocalRef<jobject> MediaSessionAndroid::GetJavaObject() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return j_media_session_.get(env);
 }
 
 }  // namespace content