Revert of Propagate audible state from player to the containing tab

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index ed0855898f8ebe7aaf59874792582e43d8d8e9d5..ae57bea44335669fdfcf1157d282f71fb5943e0a 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -22,7 +22,7 @@
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_host_manager.h"
-#include "content/browser/media/audio_state_provider.h"
+#include "content/browser/media/audio_stream_monitor.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/common/accessibility_mode_enums.h"
@@ -666,8 +666,8 @@
   // Forces overscroll to be disabled (used by touch emulation).
   void SetForceDisableOverscrollContent(bool force_disable);
 
-  AudioStateProvider* audio_state_provider() {
-    return audio_state_provider_.get();
+  AudioStreamMonitor* audio_stream_monitor() {
+    return &audio_stream_monitor_;
   }
 
   bool has_audio_power_save_blocker_for_testing() const {
@@ -1022,11 +1022,6 @@
   scoped_ptr<PowerSaveBlocker> audio_power_save_blocker_;
   scoped_ptr<PowerSaveBlocker> video_power_save_blocker_;
 
-  // Tells whether this WebContents is actively producing sound.
-  // Order is important: the |frame_tree_| destruction uses
-  // |audio_state_provider_|.
-  scoped_ptr<AudioStateProvider> audio_state_provider_;
-
   // Manages the frame tree of the page and process swaps in each node.
   FrameTree frame_tree_;
 
@@ -1241,6 +1236,9 @@
   // is created, and broadcast to all frames when it changes.
   AccessibilityMode accessibility_mode_;
 
+  // Monitors power levels for audio streams associated with this WebContents.
+  AudioStreamMonitor audio_stream_monitor_;
+
   // Created on-demand to mute all audio output from this WebContents.
   scoped_ptr<WebContentsAudioMuter> audio_muter_;