| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 2896a5496be4a6daa2e2f819ea603d10ad8aebb4..f10fce2e4d4687eb7fdf70c1284e5717583f7aa4 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -624,7 +624,7 @@ void RenderThreadImpl::WidgetRestored() {
|
|
|
| static void AdjustRuntimeFeatureDefaultsForPlatform() {
|
| #if defined(OS_ANDROID) && !defined(GOOGLE_TV)
|
| - WebRuntimeFeatures::enableMediaSource(false);
|
| + WebRuntimeFeatures::enableWebKitMediaSource(false);
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -658,8 +658,8 @@ static void AdjustRuntimeFeaturesFromArgs(const CommandLine& command_line) {
|
| WebRuntimeFeatures::enableGeolocation(false);
|
|
|
| #if !defined(OS_ANDROID) || defined(GOOGLE_TV)
|
| - if (command_line.HasSwitch(switches::kDisableMediaSource))
|
| - WebRuntimeFeatures::enableMediaSource(false);
|
| + if (command_line.HasSwitch(switches::kDisableWebKitMediaSource))
|
| + WebRuntimeFeatures::enableWebKitMediaSource(false);
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
|
|