Listen to the audio focus event for MSE/EME

media/base/android/media_player_listener.cc

Index: media/base/android/media_player_listener.cc
diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc
index 6a222984686cdf2c72d55a3cdf952378166a5783..b4261a84f9e9e3853907c64b4398e82aef4c8977 100644
--- a/media/base/android/media_player_listener.cc
+++ b/media/base/android/media_player_listener.cc
@@ -6,13 +6,11 @@
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
-#include "media/base/android/media_player_bridge.h"
-
-// Auto generated jni class from MediaPlayerListener.java.
-// Check base/android/jni_generator/golden_sample_for_tests_jni.h for example.
 #include "jni/MediaPlayerListener_jni.h"
+#include "media/base/android/media_player_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
@@ -22,7 +20,7 @@ namespace media {
 
 MediaPlayerListener::MediaPlayerListener(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
-    base::WeakPtr<MediaPlayerBridge> media_player)
+    base::WeakPtr<MediaPlayerAndroid> media_player)
     : task_runner_(task_runner),
       media_player_(media_player) {
   DCHECK(task_runner_.get());
@@ -32,12 +30,13 @@ MediaPlayerListener::MediaPlayerListener(
 MediaPlayerListener::~MediaPlayerListener() {}
 
 void MediaPlayerListener::CreateMediaPlayerListener(
-    jobject context, jobject media_player_bridge) {
+    jobject context, jobject media_player) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
-  j_media_player_listener_.Reset(
-      Java_MediaPlayerListener_create(
-          env, reinterpret_cast<intptr_t>(this), context, media_player_bridge));
+  if (j_media_player_listener_.is_null()) {
+    j_media_player_listener_.Reset(Java_MediaPlayerListener_create(
+        env, reinterpret_cast<intptr_t>(this), context, media_player));
+  }
 }
 
 
@@ -54,44 +53,44 @@ void MediaPlayerListener::ReleaseMediaPlayerListenerResources() {
 void MediaPlayerListener::OnMediaError(
     JNIEnv* /* env */, jobject /* obj */, jint error_type) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnMediaError, media_player_, error_type));
+      &MediaPlayerAndroid::OnMediaError, media_player_, error_type));
 }
 
 void MediaPlayerListener::OnVideoSizeChanged(
     JNIEnv* /* env */, jobject /* obj */, jint width, jint height) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnVideoSizeChanged, media_player_,
+      &MediaPlayerAndroid::OnVideoSizeChanged, media_player_,
       width, height));
 }
 
 void MediaPlayerListener::OnBufferingUpdate(
     JNIEnv* /* env */, jobject /* obj */, jint percent) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnBufferingUpdate, media_player_, percent));
+      &MediaPlayerAndroid::OnBufferingUpdate, media_player_, percent));
 }
 
 void MediaPlayerListener::OnPlaybackComplete(
     JNIEnv* /* env */, jobject /* obj */) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnPlaybackComplete, media_player_));
+      &MediaPlayerAndroid::OnPlaybackComplete, media_player_));
 }
 
 void MediaPlayerListener::OnSeekComplete(
     JNIEnv* /* env */, jobject /* obj */) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnSeekComplete, media_player_));
+      &MediaPlayerAndroid::OnSeekComplete, media_player_));
 }
 
 void MediaPlayerListener::OnMediaPrepared(
     JNIEnv* /* env */, jobject /* obj */) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnMediaPrepared, media_player_));
+      &MediaPlayerAndroid::OnMediaPrepared, media_player_));
 }
 
 void MediaPlayerListener::OnMediaInterrupted(
     JNIEnv* /* env */, jobject /* obj */) {
   task_runner_->PostTask(FROM_HERE, base::Bind(
-      &MediaPlayerBridge::OnMediaInterrupted, media_player_));
+      &MediaPlayerAndroid::OnMediaInterrupted, media_player_));
 }
 
 bool MediaPlayerListener::RegisterMediaPlayerListener(JNIEnv* env) {