[RemotePlayback] Stop remote playback when disableRemotePlayback is set

chrome/browser/media/android/remote/remote_media_player_bridge.cc

Index: chrome/browser/media/android/remote/remote_media_player_bridge.cc
diff --git a/chrome/browser/media/android/remote/remote_media_player_bridge.cc b/chrome/browser/media/android/remote/remote_media_player_bridge.cc
index 62f6d07bcd326500ec5359017de0be9bebe1028f..9806719a53dded5c38ccf656a45d149fde48e719 100644
--- a/chrome/browser/media/android/remote/remote_media_player_bridge.cc
+++ b/chrome/browser/media/android/remote/remote_media_player_bridge.cc
@@ -58,7 +58,7 @@ RemoteMediaPlayerBridge::RemoteMediaPlayerBridge(
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = base::android::AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   ScopedJavaLocalRef<jstring> j_url_string;
   if (url_.is_valid()) {
     // Escape the URL to make it safe to use. Don't escape existing escape
@@ -80,7 +80,7 @@ RemoteMediaPlayerBridge::RemoteMediaPlayerBridge(
 
 RemoteMediaPlayerBridge::~RemoteMediaPlayerBridge() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   Java_RemoteMediaPlayerBridge_destroy(env, java_bridge_);
   Release();
 }
@@ -262,7 +262,7 @@ void RemoteMediaPlayerBridge::RequestRemotePlayback() {
   if (!local_player)
     return;
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   Java_RemoteMediaPlayerBridge_requestRemotePlayback(
       env, java_bridge_, local_player->GetCurrentTime().InMilliseconds());
@@ -271,15 +271,23 @@ void RemoteMediaPlayerBridge::RequestRemotePlayback() {
 void RemoteMediaPlayerBridge::RequestRemotePlaybackControl() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   Java_RemoteMediaPlayerBridge_requestRemotePlaybackControl(env, java_bridge_);
 }
 
+void RemoteMediaPlayerBridge::RequestRemotePlaybackStop() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  JNIEnv* env = AttachCurrentThread();
+  DCHECK(env);
+
+  Java_RemoteMediaPlayerBridge_requestRemotePlaybackStop(env, java_bridge_);
+}
+
 void RemoteMediaPlayerBridge::SetNativePlayer() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   Java_RemoteMediaPlayerBridge_setNativePlayer(env, java_bridge_);
 }
@@ -287,7 +295,7 @@ void RemoteMediaPlayerBridge::SetNativePlayer() {
 void RemoteMediaPlayerBridge::OnPlayerCreated() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   Java_RemoteMediaPlayerBridge_onPlayerCreated(env, java_bridge_);
 }
@@ -295,7 +303,7 @@ void RemoteMediaPlayerBridge::OnPlayerCreated() {
 void RemoteMediaPlayerBridge::OnPlayerDestroyed() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   Java_RemoteMediaPlayerBridge_onPlayerDestroyed(env, java_bridge_);
 }
@@ -309,7 +317,7 @@ void RemoteMediaPlayerBridge::SetPosterBitmap(
     const std::vector<SkBitmap>& bitmaps) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
 
   if (bitmaps.empty()) {
     Java_RemoteMediaPlayerBridge_setPosterBitmap(env, java_bridge_, nullptr);
@@ -342,7 +350,7 @@ void RemoteMediaPlayerBridge::SeekTo(base::TimeDelta time) {
   }
 
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   int time_msec = static_cast<int>(time.InMilliseconds());
   Java_RemoteMediaPlayerBridge_seekTo(env, java_bridge_, time_msec);
 }
@@ -359,7 +367,7 @@ void RemoteMediaPlayerBridge::UpdateEffectiveVolumeInternal(
     double effective_volume) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   Java_RemoteMediaPlayerBridge_setVolume(env, java_bridge_,
                                          GetEffectiveVolume());
 }
@@ -393,7 +401,7 @@ base::TimeDelta RemoteMediaPlayerBridge::GetDuration() {
 bool RemoteMediaPlayerBridge::IsPlaying() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   jboolean result = Java_RemoteMediaPlayerBridge_isPlaying(env, java_bridge_);
   return result;
 }
@@ -468,7 +476,7 @@ void RemoteMediaPlayerBridge::OnCookiesRetrieved(const std::string& cookies) {
   // authentication? MediaPlayerBridge does.
   cookies_ = cookies;
   JNIEnv* env = AttachCurrentThread();
-  CHECK(env);
+  DCHECK(env);
   Java_RemoteMediaPlayerBridge_setCookies(
       env, java_bridge_, ConvertUTF8ToJavaString(env, cookies));
 }