Remove MediaWebContentsObserverAndroid
With the removal of MediaPlayerManager and MediaPlayerAndroid,
SuspendAllMediaPlayers is the only method left in
MediaWebContentsObserverAndroid.
This CL moves the method into its parent class, and deletes MWCOA.
Bug: 790766, 926595
Change-Id: I5c98509729afbdfe4c6a06a74f26046b6afc1eb9
Reviewed-on: https://chromium-review.googlesource.com/c/1471306
Reviewed-by: Dale Curtis <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Commit-Queue: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#632104}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 613d5ff1..e87aa15 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -170,7 +170,6 @@
#if defined(OS_ANDROID)
#include "content/browser/android/date_time_chooser_android.h"
#include "content/browser/android/java_interfaces_impl.h"
-#include "content/browser/media/android/media_web_contents_observer_android.h"
#include "content/browser/web_contents/web_contents_android.h"
#include "services/device/public/mojom/nfc.mojom.h"
#else // !OS_ANDROID
@@ -592,6 +591,8 @@
browser_context)),
audio_stream_monitor_(this),
bluetooth_connected_device_count_(0),
+ media_web_contents_observer_(
+ std::make_unique<MediaWebContentsObserver>(this)),
media_device_group_id_salt_base_(
BrowserContext::CreateRandomMediaDeviceIDSalt()),
#if !defined(OS_ANDROID)
@@ -604,11 +605,6 @@
frame_tree_.SetFrameRemoveListener(
base::Bind(&WebContentsImpl::OnFrameRemoved,
base::Unretained(this)));
-#if defined(OS_ANDROID)
- media_web_contents_observer_.reset(new MediaWebContentsObserverAndroid(this));
-#else
- media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
-#endif
#if BUILDFLAG(ENABLE_PLUGINS)
pepper_playback_observer_.reset(new PepperPlaybackObserver(this));
#endif
