Add --enable-webkit-media-source for Android instead of hardcoding it to be disabled.

content/public/common/content_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/content_switches.h"
 
 namespace switches {
 
 // By default, file:// URIs cannot read other file:// URIs. This is an
 // override for developers who need the old behavior for testing.
@@ skipping 336 matching lines @@
 // Enables the memory benchmarking extension
 const char kEnableMemoryBenchmarking[]      = "enable-memory-benchmarking";
 
 // Enables the Skia benchmarking extension
 const char kEnableSkiaBenchmarking[]         = "enable-skia-benchmarking";
 
 // Force logging to be enabled.  Logging is disabled by default in release
 // 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";
 
 // On Windows, converts the page to the currently-installed monitor profile.
 // This does NOT enable color management for images. The source is still
 // assumed to be sRGB.
 const char kEnableMonitorProfile[]          = "enable-monitor-profile";
 
 // Enables compositor-accelerated touch-screen pinch gestures.
@@ skipping 460 matching lines @@
 const char kOverscrollHistoryNavigation[] =
     "overscroll-history-navigation";
 
 // Forward overscroll event data from the renderer to the browser.
 const char kEnableOverscrollNotifications[] = "enable-overscroll-notifications";
 
 // Enables 'image/webp' accept header for image requests.
 const char kEnableWebPInAcceptHeader[] = "enable-webp-in-accept-header";
 
 }  // namespace switches