media: Remove VP9 flag, and enable VP9 support by default.

media/filters/stream_parser_factory.cc

 // Copyright (c) 2013 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 "media/filters/stream_parser_factory.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 182 matching lines @@
 // |audio_codecs| has |codec_info|.tag added to its list if |codec_info| is an
 // audio codec. |audio_codecs| may be NULL, in which case it is not updated.
 // |video_codecs| has |codec_info|.tag added to its list if |codec_info| is a
 // video codec. |video_codecs| may be NULL, in which case it is not updated.
 //
 // Returns false otherwise, and |audio_codecs| and |video_codecs| not touched.
 static bool VerifyCodec(
     const CodecInfo* codec_info,
     std::vector<CodecInfo::HistogramTag>* audio_codecs,
     std::vector<CodecInfo::HistogramTag>* video_codecs) {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   switch (codec_info->type) {
     case CodecInfo::AUDIO:
 #if defined(ENABLE_EAC3_PLAYBACK)
-      if (codec_info->tag == CodecInfo::HISTOGRAM_EAC3 &&
-          !cmd_line->HasSwitch(switches::kEnableEac3Playback)) {
-        return false;
+      if (codec_info->tag == CodecInfo::HISTOGRAM_EAC3) {
+        const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+        if (!cmd_line->HasSwitch(switches::kEnableEac3Playback))
+          return false;
       }
 #endif
       if (audio_codecs)
         audio_codecs->push_back(codec_info->tag);
       return true;
     case CodecInfo::VIDEO:
-      // TODO(tomfinegan): Remove this check (or negate it, if we just
-      // negate the flag) when VP9 is enabled by default.
-      if (codec_info->tag == CodecInfo::HISTOGRAM_VP9 &&
-          !cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
-        return false;
-      }
       if (video_codecs)
         video_codecs->push_back(codec_info->tag);
       return true;
     default:
       // Not audio or video, so skip it.
       DVLOG(1) << "CodecInfo type of " << codec_info->type
                << " should not be specified in a SupportedTypes list";
       return false;
   }
 }
@@ skipping 97 matching lines @@
           "Media.MSE.VideoCodec", video_codecs[i], CodecInfo::HISTOGRAM_MAX);
     }
 
     stream_parser.reset(factory_function(codecs, log_cb));
   }
 
   return stream_parser.Pass();
 }
 
 }  // namespace media