enable MSE and legacy EME by default on Android

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 368 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";
 
-// 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";
 
 // Disables prefixed Encrypted Media API (e.g. webkitGenerateKeyRequest()).
 const char kDisableLegacyEncryptedMedia[] = "disable-legacy-encrypted-media";
 
 // Use fake device for MediaStream to replace actual camera and microphone.
 const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream";
 
@@ skipping 494 matching lines @@
 const char kEnableWebGLDraftExtensions[] = "enable-webgl-draft-extensions";
 
 // Enables/disables accelerated compositing for backgrounds of root layers with
 // background-attachment: fixed. Requires kForceCompositingMode.
 const char kDisableAcceleratedFixedRootBackground[] =
     "disable-accelerated-fixed-root-background";
 const char kEnableAcceleratedFixedRootBackground[] =
     "enable-accelerated-fixed-root-background";
 
 }  // namespace switches