media: Enabling VP8 Alpha playback by default.

Flipping the flag for VP8 Alpha playback from disabled by default
to enabled by default. Changing the name of the flag to
"disable-vp8-alpha-playback".

BUG=147355
TEST=media_unittests still pass

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

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

7 files changed, 13 insertions, 18 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 0f88197..6a3af14 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6008,11 +6008,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION" desc="Description for the flag to enable Opus playback in &lt;video&gt; elements.">
         Enable experimental Opus playback in the video element.
       </message>
-      <message name="IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_NAME" desc="Title for the flag to enable VP8 Alpha playback in &lt;video&gt; elements.">
-        Enable VP8 Alpha playback in &lt;video&gt; elements.
+      <message name="IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_NAME" desc="Title for the flag to disable VP8 Alpha playback in &lt;video&gt; elements.">
+        Disable VP8 Alpha playback in &lt;video&gt; elements.
       </message>
-      <message name="IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION" desc="Description for the flag to enable VP8 Alpha playback in &lt;video&gt; elements.">
-        Enable experimental VP8 Alpha playback in the video element.
+      <message name="IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION" desc="Description for the flag to disable VP8 Alpha playback in &lt;video&gt; elements.">
+        Disable VP8 Alpha playback in the video element.
       </message>
       <message name="IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME" desc="Name for the option to enable/disable the auto window placement functionality.">
         Automatic window placement.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 258a60b..e558f26 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -763,11 +763,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback)
   },
  {
-    "enable-vp8-alpha-playback",
-    IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_NAME,
-    IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION,
+    "disable-vp8-alpha-playback",
+    IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_NAME,
+    IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION,
     kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kEnableVp8AlphaPlayback)
+    SINGLE_VALUE_TYPE(switches::kDisableVp8AlphaPlayback)
   },
   {
     "enable-managed-users",
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index d023fa8..777972c 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -951,7 +951,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableViewport,
     switches::kEnableInbandTextTracks,
     switches::kEnableOpusPlayback,
-    switches::kEnableVp8AlphaPlayback,
+    switches::kDisableVp8AlphaPlayback,
     switches::kEnableEac3Playback,
     switches::kForceDeviceScaleFactor,
     switches::kFullMemoryCrashReport,
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 2ebf5df..567d779 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -15,8 +15,8 @@ const char kEnableEac3Playback[] = "enable-eac3-playback";
 // Enables Opus playback in media elements.
 const char kEnableOpusPlayback[] = "enable-opus-playback";
 
-// Enables VP8 Alpha playback in media elements.
-const char kEnableVp8AlphaPlayback[] = "enable-vp8-alpha-playback";
+// Disables VP8 Alpha playback in media elements.
+const char kDisableVp8AlphaPlayback[] = "disable-vp8-alpha-playback";
 
 // Set number of threads to use for video decoding.
 const char kVideoThreads[] = "video-threads";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index e6c1de0..3009f60 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -18,7 +18,7 @@ MEDIA_EXPORT extern const char kEnableEac3Playback[];
 
 MEDIA_EXPORT extern const char kEnableOpusPlayback[];
 
-MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[];
+MEDIA_EXPORT extern const char kDisableVp8AlphaPlayback[];
 
 MEDIA_EXPORT extern const char kVideoThreads[];
 
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index 28ef5c6..f0c3a6b 100644
--- a/media/base/run_all_unittests.cc
+++ b/media/base/run_all_unittests.cc
@@ -37,11 +37,6 @@ void TestSuiteNoAtExit::Initialize() {
   // Run this here instead of main() to ensure an AtExitManager is already
   // present.
   media::InitializeMediaLibraryForTesting();
-  // Enable VP8 alpha support for all media tests.
-  // TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or
-  // negated.
-  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-  cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback);
 }
 
 int main(int argc, char** argv) {
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index 3f12594..3c02d15 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -121,7 +121,7 @@ bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
   bool can_handle = false;
   if (config.codec() == kCodecVP9)
     can_handle = true;
-  if (cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback) &&
+  if (!cmd_line->HasSwitch(switches::kDisableVp8AlphaPlayback) &&
       config.codec() == kCodecVP8 && config.format() == VideoFrame::YV12A) {
     can_handle = true;
   }