Revert of Propagate audible state from player to the containing tab

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 90 matching lines @@
 #include "ui/gfx/screen.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(ENABLE_BROWSER_CDMS)
 #include "content/browser/media/media_web_contents_observer.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/content_video_view.h"
 #include "content/browser/android/date_time_chooser_android.h"
-#include "content/browser/android/media_players_observer.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/web_contents/web_contents_android.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif
 
 namespace content {
 namespace {
@@ skipping 230 matching lines @@
       render_view_message_source_(NULL),
       render_frame_message_source_(NULL),
       fullscreen_widget_routing_id_(MSG_ROUTING_NONE),
       fullscreen_widget_had_focus_at_shutdown_(false),
       is_subframe_(false),
       force_disable_overscroll_content_(false),
       last_dialog_suppressed_(false),
       geolocation_service_context_(new GeolocationServiceContext()),
       accessibility_mode_(
           BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()),
+      audio_stream_monitor_(this),
       virtual_keyboard_requested_(false),
       loading_weak_factory_(this) {
   frame_tree_.SetFrameRemoveListener(
       base::Bind(&WebContentsImpl::OnFrameRemoved,
                  base::Unretained(this)));
 #if defined(ENABLE_BROWSER_CDMS)
   media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
 #endif
-
-#if defined(OS_ANDROID)
-  audio_state_provider_.reset(new MediaPlayersObserver(this));
-#else
-  audio_state_provider_.reset(new AudioStreamMonitor(this));
-#endif
 }
 
 WebContentsImpl::~WebContentsImpl() {
   is_being_destroyed_ = true;
 
   // Delete all RFH pending shutdown, which will lead the corresponding RVH to
   // shutdown and be deleted as well.
   frame_tree_.ForEach(
       base::Bind(&RenderFrameHostManager::ClearRFHsPendingShutdown));
 
@@ skipping 654 matching lines @@
 
 bool WebContentsImpl::IsBeingDestroyed() const {
   return is_being_destroyed_;
 }
 
 void WebContentsImpl::NotifyNavigationStateChanged(
     InvalidateTypes changed_flags) {
   // Create and release the audio power save blocker depending on whether the
   // tab is actively producing audio or not.
   if ((changed_flags & INVALIDATE_TYPE_TAB) &&
-      audio_state_provider_->IsAudioStateAvailable()) {
+      AudioStreamMonitor::monitoring_available()) {
     if (WasRecentlyAudible()) {
       if (!audio_power_save_blocker_)
         CreateAudioPowerSaveBlocker();
     } else {
       audio_power_save_blocker_.reset();
     }
   }
 
   if (delegate_)
     delegate_->NavigationStateChanged(this, changed_flags);
@@ skipping 1454 matching lines @@
   }
   Send(new ViewMsg_StopFinding(GetRoutingID(), action));
 }
 
 void WebContentsImpl::InsertCSS(const std::string& css) {
   GetMainFrame()->Send(new FrameMsg_CSSInsertRequest(
       GetMainFrame()->GetRoutingID(), css));
 }
 
 bool WebContentsImpl::WasRecentlyAudible() {
-  return audio_state_provider_->WasRecentlyAudible();
+  return audio_stream_monitor_.WasRecentlyAudible();
 }
 
 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) {
   manifest_manager_host_->GetManifest(GetMainFrame(), callback);
 }
 
 void WebContentsImpl::ExitFullscreen() {
   // Clean up related state and initiate the fullscreen exit.
   GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary();
   ExitFullscreenMode();
@@ skipping 666 matching lines @@
   static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
       ->InitDisplaySleepBlocker(GetView()->GetNativeView());
 #endif
 }
 
 void WebContentsImpl::MaybeReleasePowerSaveBlockers() {
   // If there are no more audio players and we don't have audio stream
   // monitoring, release the audio power save blocker here instead of during
   // NotifyNavigationStateChanged().
   if (active_audio_players_.empty() &&
-      !audio_state_provider_->IsAudioStateAvailable()) {
+      !AudioStreamMonitor::monitoring_available()) {
     audio_power_save_blocker_.reset();
   }
 
   // If there are no more video players, clear the video power save blocker.
   if (active_video_players_.empty())
     video_power_save_blocker_.reset();
 }
 
 void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie,
                                                  bool has_video,
                                                  bool has_audio,
                                                  bool is_remote) {
   // Ignore the videos playing remotely and don't hold the wake lock for the
   // screen.
   if (is_remote) return;
 
   if (has_audio) {
     AddMediaPlayerEntry(player_cookie, &active_audio_players_);
 
     // If we don't have audio stream monitoring, allocate the audio power save
     // blocker here instead of during NotifyNavigationStateChanged().
     if (!audio_power_save_blocker_ &&
-        !audio_state_provider_->IsAudioStateAvailable()) {
+        !AudioStreamMonitor::monitoring_available()) {
       CreateAudioPowerSaveBlocker();
     }
   }
 
   if (has_video) {
     AddMediaPlayerEntry(player_cookie, &active_video_players_);
 
     // If we're not hidden and have just created a player, create a blocker.
     if (!video_power_save_blocker_ && !IsHidden())
       CreateVideoPowerSaveBlocker();
@@ skipping 1276 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content