Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index c1d10875ae0a8d3a79352bdea752b0e98f46ade1..ede16421d7a0cfc89d2278a569153d4a6639cb64 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -108,7 +108,6 @@ |
#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 |
@@ -359,6 +358,7 @@ |
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( |
@@ -366,12 +366,6 @@ |
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 |
} |
@@ -1047,7 +1041,7 @@ |
// 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(); |
@@ -2522,7 +2516,7 @@ |
} |
bool WebContentsImpl::WasRecentlyAudible() { |
- return audio_state_provider_->WasRecentlyAudible(); |
+ return audio_stream_monitor_.WasRecentlyAudible(); |
} |
void WebContentsImpl::GetManifest(const GetManifestCallback& callback) { |
@@ -3209,7 +3203,7 @@ |
// 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(); |
} |
@@ -3232,7 +3226,7 @@ |
// 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(); |
} |
} |