Consistent CopyFromSurface() API, consolidated to RWHV

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 9464fc51e6ab9bf8c8e30453391ae6d08aaceba1..0122d8f6632f21afa953ac56687b27885d2a5b38 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -117,10 +117,6 @@ bool TestRenderWidgetHostView::HasFocus() const {
   return true;
 }
 
-bool TestRenderWidgetHostView::IsSurfaceAvailableForCopy() const {
-  return true;
-}
-
 void TestRenderWidgetHostView::Show() {
   is_showing_ = true;
   is_occluded_ = false;
@@ -153,25 +149,6 @@ gfx::Rect TestRenderWidgetHostView::GetViewBounds() const {
   return gfx::Rect();
 }
 

[ncarter (slow), 2017/03/01 18:34:26]

with the removal of the overrides, TestRenderWidgetHostView just now uses the
versions from RenderWidgetHostViewBase, is that right? And those have a
NOTIMPLEMENTED().

Was it the case that these are not actually called in any unittest?

[miu, 2017/03/01 22:18:24]

Yes...Only the WCVideoCaptureDevice unit tests would call them, *except* those
tests override CopyFromSurfaceToVideoFrame() with their own impl (and do not use
CopyFromSurface()).

Otherwise, tests that use this API are running as browser tests, and are using
the normal platform impls instead of a TestRenderWidgetHostView.

-void TestRenderWidgetHostView::CopyFromCompositingSurface(
-    const gfx::Rect& src_subrect,
-    const gfx::Size& dst_size,
-    const ReadbackRequestCallback& callback,
-    const SkColorType preferred_color_type) {
-  callback.Run(SkBitmap(), content::READBACK_FAILED);
-}
-
-void TestRenderWidgetHostView::CopyFromCompositingSurfaceToVideoFrame(
-    const gfx::Rect& src_subrect,
-    const scoped_refptr<media::VideoFrame>& target,
-    const base::Callback<void(const gfx::Rect&, bool)>& callback) {
-  callback.Run(gfx::Rect(), false);
-}
-
-bool TestRenderWidgetHostView::CanCopyToVideoFrame() const {
-  return false;
-}
-
 bool TestRenderWidgetHostView::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   return false;