| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index fa07c5d368d47d4ce34801fc3b1ad51172591434..894029f5ef86d5272912b50ccd1453b3155a63a2 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -695,6 +695,15 @@ const Experiment kExperiments[] = {
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
|
| switches::kDisableAsyncDns)
|
| },
|
| +#if defined(ANDROID) && !defined(GOOGLE_TV)
|
| + {
|
| + "enable-media-source",
|
| + IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_NAME,
|
| + IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
|
| + kOsAll,
|
| + SINGLE_VALUE_TYPE(switches::kEnableWebKitMediaSource)
|
| + },
|
| +#else
|
| {
|
| "disable-media-source",
|
| IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME,
|
| @@ -702,6 +711,7 @@ const Experiment kExperiments[] = {
|
| kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource)
|
| },
|
| +#endif
|
| {
|
| "disable-encrypted-media",
|
| IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
|
|
|