diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 16:14:27 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 16:14:27 +0000 |
| commit | 04941ecad2a0ef7a38069a9e784f45d3b500abe6 (patch) | |
| tree | 1003b82912a9ece9e659ede7f124aa5e3d45960e /media/base | |
| parent | 5b39691e94a857aa3442bff2b183ab88f37ce2ba (diff) | |
| download | chromium_src-04941ecad2a0ef7a38069a9e784f45d3b500abe6.zip chromium_src-04941ecad2a0ef7a38069a9e784f45d3b500abe6.tar.gz chromium_src-04941ecad2a0ef7a38069a9e784f45d3b500abe6.tar.bz2 | |
Enable use of MediaDrm by default on Android.
This reverts r227878: "Disable use of MediaDrm by default on Android."
Widevine key system is also enabled with EME on Chrome for Android.
BUG=163552
R=ddorwin@chromium.org, qinmin@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/32883003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/media_switches.cc | 3 | ||||
| -rw-r--r-- | media/base/media_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index c295a0d..2cb6d50 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -33,9 +33,6 @@ const char kEnableMP3StreamParser[] = "enable-mp3-stream-parser"; const char kDisableInfobarForProtectedMediaIdentifier[] = "disable-infobar-for-protected-media-identifier"; -// Enables use of MediaDrm for Encrypted Media Extensions implementation. -const char kEnableMediaDrm[] = "enable-mediadrm"; - // Enables use of non-compositing MediaDrm decoding by default for Encrypted // Media Extensions implementation. const char kMediaDrmEnableNonCompositing[] = "mediadrm-enable-non-compositing"; diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 963a351..e678dcc 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -28,7 +28,6 @@ MEDIA_EXPORT extern const char kEnableMP3StreamParser[]; #if defined(OS_ANDROID) MEDIA_EXPORT extern const char kDisableInfobarForProtectedMediaIdentifier[]; -MEDIA_EXPORT extern const char kEnableMediaDrm[]; MEDIA_EXPORT extern const char kMediaDrmEnableNonCompositing[]; #endif |