media: Optimize HW Video to 2D Canvas copy.

content/browser/renderer_host/render_widget_host_view_browsertest.cc

Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index a1ffa149078c0beb4656ae765f54003d38c72f68..d758bfef616fec2f91971907d058ef151dbfea60 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -6,6 +6,7 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
+#include "cc/resources/media/skcanvas_video_renderer.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
@@ -23,7 +24,6 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/video_frame.h"
-#include "media/filters/skcanvas_video_renderer.h"
 #include "net/base/filename_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -486,7 +486,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
       return;
     }
 
-    media::SkCanvasVideoRenderer video_renderer;
+    cc::SkCanvasVideoRenderer video_renderer;
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(video_frame->visible_rect().width(),
@@ -494,10 +494,8 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
     bitmap.eraseColor(SK_ColorTRANSPARENT);
     SkCanvas canvas(bitmap);
 
-    video_renderer.Paint(video_frame.get(),
-                         &canvas,
-                         video_frame->visible_rect(),
-                         0xff);
+    video_renderer.Paint(
+        video_frame.get(), &canvas, video_frame->visible_rect(), 0xff, 0);
 
     CopyFromCompositingSurfaceCallback(quit_callback,
                                        result,