| Index: content/public/browser/android/browser_media_player_manager_register.cc
|
| diff --git a/content/public/browser/android/browser_media_player_manager_register.cc b/content/public/browser/android/browser_media_player_manager_register.cc
|
| index e15133252491e8e6b3b5fd23c95f99d0c524ea79..e9c2128e7546e8c94cf7aeceb46995325b6d8c0c 100644
|
| --- a/content/public/browser/android/browser_media_player_manager_register.cc
|
| +++ b/content/public/browser/android/browser_media_player_manager_register.cc
|
| @@ -4,14 +4,24 @@
|
|
|
| #include "content/public/browser/android/browser_media_player_manager_register.h"
|
|
|
| +#include "base/feature_list.h"
|
| #include "content/browser/media/android/browser_media_player_manager.h"
|
| +#include "content/browser/media/android/media_player_renderer.h"
|
| +#include "media/base/media_switches.h"
|
|
|
| namespace content {
|
|
|
| void RegisterMediaUrlInterceptor(
|
| media::MediaUrlInterceptor* media_url_interceptor) {
|
| - content::BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
|
| - media_url_interceptor);
|
| + if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) {
|
| + content::MediaPlayerRenderer::RegisterMediaUrlInterceptor(
|
| + media_url_interceptor);
|
| + } else {
|
| + // TODO(tguilbert): Remove this and rename this file when deleting WMPA. See
|
| + // crbug.com/570711.
|
| + content::BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
|
| + media_url_interceptor);
|
| + }
|
| }
|
|
|
| } // namespace content
|
|
|