Reverted the code for the non-interactive audible tab notification

Depends on https://codereview.chromium.org/1159113006 (just landed)
Reverts:
- https://codereview.chromium.org/975943003
- https://codereview.chromium.org/1008093002
- https://chrome-internal-review.googlesource.com/#/c/204475/
- https://chrome-internal-review.googlesource.com/#/c/210391/

BUG=470600

Review URL: https://codereview.chromium.org/1215713021

Cr-Commit-Position: refs/heads/master@{#346205}

1 files changed, 1 insertions, 20 deletions

diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc
index b4e41ec..8e48e68 100644
--- a/content/browser/media/media_web_contents_observer.cc
+++ b/content/browser/media/media_web_contents_observer.cc
@@ -8,13 +8,11 @@
 #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"
@@ -38,10 +36,6 @@ 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);
-
-  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.
@@ -165,24 +159,11 @@ BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
   if (!media_player_managers_.contains(key)) {
     media_player_managers_.set(
         key,
-        make_scoped_ptr(BrowserMediaPlayerManager::Create(
-            render_frame_host, GetMediaPlayersObserver())));
+        make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
   }
   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();