enable MSE and legacy EME by default on Android

We are planning to launch MSE and clearkey/EME for M30 on android.
This CL will enable MSE and clearkey/EME for android.

Launch bug:
BUG=233420,263679

Review URL: https://chromiumcodereview.appspot.com/20104005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213881 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 27 deletions

diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index c2f0c9e..bd119dd 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -26,8 +26,6 @@ class MediaSourceTest : public content::MediaBrowserTest {
 
 #if defined(OS_ANDROID)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    // TODO(scherkus): Remove after enabled by default http://crbug.com/233420
-    command_line->AppendSwitch(switches::kEnableWebKitMediaSource);
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
   }
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b3ce557..cb769d9 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -935,11 +935,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableWebRtcTcpServerSocket,
     switches::kEnableWebRtcHWDecoding,
 #endif
-#if defined(ANDROID) && !defined(GOOGLE_TV)
-    switches::kEnableWebKitMediaSource,
-#else
     switches::kDisableWebKitMediaSource,
-#endif
     switches::kEnableOverscrollNotifications,
     switches::kEnableStrictSiteIsolation,
     switches::kDisableFullScreen,
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index b866c24..069d5ae 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -17,12 +17,6 @@ using WebKit::WebRuntimeFeatures;
 namespace content {
 
 static void SetRuntimeFeatureDefaultsForPlatform() {
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-  WebRuntimeFeatures::enableWebKitMediaSource(false);
-  WebRuntimeFeatures::enableLegacyEncryptedMedia(false);
-  WebRuntimeFeatures::enableEncryptedMedia(false);
-#endif
-
 #if defined(OS_ANDROID)
   bool enable_webaudio = false;
 #if defined(ARCH_CPU_ARMEL)
@@ -66,13 +60,8 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kDisableGeolocation))
     WebRuntimeFeatures::enableGeolocation(false);
 
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-  if (command_line.HasSwitch(switches::kEnableWebKitMediaSource))
-    WebRuntimeFeatures::enableWebKitMediaSource(true);
-#else
   if (command_line.HasSwitch(switches::kDisableWebKitMediaSource))
     WebRuntimeFeatures::enableWebKitMediaSource(false);
-#endif
 
 #if defined(OS_ANDROID)
   if (command_line.HasSwitch(switches::kDisableWebRTC)) {
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 50dffe3..88ee98c 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
+// Disables prefixed Media Source API (i.e., the WebKitMediaSource object).
 const char kDisableWebKitMediaSource[]      = "disable-webkit-media-source";
-#endif
 
 // Enables support for Encrypted Media Extensions (e.g. MediaKeys).
 const char kEnableEncryptedMedia[] = "enable-encrypted-media";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index e0e2195..434577e 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -129,11 +129,7 @@ CONTENT_EXPORT extern const char kEnableInbandTextTracks[];
 extern const char kEnableMemoryBenchmarking[];
 extern const char kEnableSkiaBenchmarking[];
 CONTENT_EXPORT extern const char kEnableLogging[];
-#if defined(ANDROID) && !defined(GOOGLE_TV)
-CONTENT_EXPORT extern const char kEnableWebKitMediaSource[];
-#else
 extern const char kDisableWebKitMediaSource[];
-#endif
 extern const char kEnableEncryptedMedia[];
 extern const char kDisableLegacyEncryptedMedia[];
 CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[];