Add wrapper class to media for support of VP9 video, and add a command line flag to enable the supp…

webkit/media/filter_helpers.cc

Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 55e7e2393e2f9767d63480b74670cedb01f5aaed..57034129cf66b9f364fecc8f998ede5a21ec7301 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -14,6 +14,7 @@
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
+#include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "webkit/media/media_stream_client.h"
 
@@ -43,6 +44,12 @@ static void AddDefaultDecodersToCollection(
   scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
       new media::FFmpegVideoDecoder(message_loop);
   filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
+
+  if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
+    scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder =
+        new media::VpxVideoDecoder(message_loop);
+    filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder);
+  }
 }
 
 bool BuildMediaStreamCollection(