| Index: chromecast/browser/cast_browser_main_parts.cc
|
| diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
|
| index 276cbf9362e4ab7e7a16cb19170351b6a2f0f861..57bede8248eb901e7802f8a42383917e8d116ed8 100644
|
| --- a/chromecast/browser/cast_browser_main_parts.cc
|
| +++ b/chromecast/browser/cast_browser_main_parts.cc
|
| @@ -66,9 +66,7 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "chromecast/app/android/crash_handler.h"
|
| -#include "chromecast/common/media/cast_media_client_android.h"
|
| #include "components/crash/content/browser/crash_dump_manager_android.h"
|
| -#include "media/base/android/media_client_android.h"
|
| #include "media/base/media_switches.h"
|
| #include "net/android/network_change_notifier_factory_android.h"
|
| #else
|
| @@ -385,9 +383,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
|
| cast_browser_process_->SetPrefService(
|
| PrefServiceHelper::CreatePrefService(pref_registry.get()));
|
|
|
| -#if defined(OS_ANDROID)
|
| - ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid());
|
| -#else
|
| +#if !defined(OS_ANDROID)
|
| memory_pressure_monitor_.reset(new CastMemoryPressureMonitor());
|
| #endif // defined(OS_ANDROID)
|
|
|
|
|