Propagate audible state from player to the containing tab

content/browser/media/media_web_contents_observer.cc

Index: content/browser/media/media_web_contents_observer.cc
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc
index cc90b55ec02b7c582ccf883eb5c942b345369683..94d1ff598007f600f0f05c41edb71b02e3755e72 100644
--- a/content/browser/media/media_web_contents_observer.cc
+++ b/content/browser/media/media_web_contents_observer.cc
@@ -8,11 +8,13 @@
 #include "base/stl_util.h"
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message_macros.h"
 
 #if defined(OS_ANDROID)
+#include "content/browser/android/media_players_observer.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "media/base/android/media_player_android.h"
@@ -22,7 +24,8 @@ namespace content {
 
 MediaWebContentsObserver::MediaWebContentsObserver(
     WebContents* web_contents)
-    : WebContentsObserver(web_contents) {
+    : WebContentsObserver(web_contents)
+{
 }
 
 MediaWebContentsObserver::~MediaWebContentsObserver() {
@@ -35,6 +38,12 @@ void MediaWebContentsObserver::RenderFrameDeleted(
   // Always destroy the media players before CDMs because we do not support
   // detaching CDMs from media players yet. See http://crbug.com/330324
   media_player_managers_.erase(key);
+
+  if (!static_cast<WebContentsImpl*>(web_contents())->IsBeingDestroyed()) {

[no sievers, 2015/03/02 20:21:24]

Why do you have to check this?

[Tima Vaisburd, 2015/03/02 21:03:03]

Because otherwise it crashed the test, but the test is going to be removed, so
this piece will be removed too. 

[Tima Vaisburd, 2015/03/02 22:16:10]

This check is removed now.

+    MediaPlayersObserver* audio_observer = GetMediaPlayersObserver();
+    if (audio_observer)
+      audio_observer->RenderFrameDeleted(render_frame_host);
+  }
 #endif
   // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
   // and BrowserCdmManager all run on browser UI thread. So this call is okay.
@@ -47,6 +56,7 @@ void MediaWebContentsObserver::RenderFrameDeleted(
     browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
 }
 
+
 #if defined(OS_ANDROID)
 
 bool MediaWebContentsObserver::OnMessageReceived(
@@ -161,11 +171,24 @@ BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
   if (!media_player_managers_.contains(key)) {
     media_player_managers_.set(
         key,
-        make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
+        make_scoped_ptr(BrowserMediaPlayerManager::Create(
+            render_frame_host, GetMediaPlayersObserver())));
   }
   return media_player_managers_.get(key);
 }
 
+MediaPlayersObserver*
+MediaWebContentsObserver::GetMediaPlayersObserver() const {
+  AudioStateProvider* provider =
+      static_cast<WebContentsImpl*>(web_contents())->audio_state_provider();
+
+  MediaPlayersObserver* audio_observer =
+      static_cast<MediaPlayersObserver*>(provider);
+
+  DCHECK(audio_observer);
+  return audio_observer;
+}
+
 #if defined(VIDEO_HOLE)
 void MediaWebContentsObserver::OnFrameInfoUpdated() {
   for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();