| Index: content/public/common/content_switches.cc
|
| diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
|
| index 664b87f8e69fac91f21f4fcf22a07d285ff5410e..2e207aa97c496716bb185219e42f0226062fcdfe 100644
|
| --- a/content/public/common/content_switches.cc
|
| +++ b/content/public/common/content_switches.cc
|
| @@ -354,8 +354,13 @@ const char kEnableSkiaBenchmarking[] = "enable-skia-benchmarking";
|
| // builds.
|
| const char kEnableLogging[] = "enable-logging";
|
|
|
| -// Disable prefixed Media Source API (i.e., the WebKitMediaSource object).
|
| -const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
|
| +// Enable for Android (see http://crbug.com/233420) or disable for desktop the
|
| +// prefixed Media Source API (i.e., the WebKitMediaSource object).
|
| +#if defined(ANDROID) && !defined(GOOGLE_TV)
|
| +const char kEnableWebKitMediaSource[] = "enable-webkit-media-source";
|
| +#else
|
| +const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
|
| +#endif
|
|
|
| // Use fake device for MediaStream to replace actual camera and microphone.
|
| const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream";
|
|
|