enable MSE and legacy EME by default on Android

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 36089c9560f9e542a6e10c78215c41f696d1bd19..eed26c19a8880ac921b60223dc691ef54e9664b2 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -386,13 +386,8 @@ const char kEnableSkiaBenchmarking[]         = "enable-skia-benchmarking";
 // builds.
 const char kEnableLogging[]                 = "enable-logging";
 
-// 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
+// Disable prefixed Media Source API (i.e., the WebKitMediaSource object).

[xhwang, 2013/07/24 22:22:35]

s/Disable/Disables/

[qinmin, 2013/07/24 22:32:42]

Done.

 const char kDisableWebKitMediaSource[]      = "disable-webkit-media-source";
-#endif
 
 // Enables support for Encrypted Media Extensions (e.g. MediaKeys).
 const char kEnableEncryptedMedia[] = "enable-encrypted-media";