Revert of Moving pixel-capturing code from web_test_proxy_base.* into pixel_dump.*

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 8e7610005fe87b6238660d4c473510a7f9a2849e..67cb1028323b679493d08287bd6b4c67bbbaf925 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -30,7 +30,6 @@
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/test_runner/gamepad_controller.h"
-#include "components/test_runner/pixel_dump.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
@@ -730,8 +729,11 @@
   return placeholder->plugin();
 }
 
-float BlinkTestRunner::GetDeviceScaleFactorForTest() const {
-  return render_view()->GetDeviceScaleFactorForTest();
+blink::WebPoint BlinkTestRunner::ConvertDIPToNative(
+    const blink::WebPoint& point_in_dip) const {
+  float scale = render_view()->GetDeviceScaleFactorForTest();
+  return blink::WebPoint(point_in_dip.x * scale,
+                         point_in_dip.y * scale);
 }
 
 bool BlinkTestRunner::AddMediaStreamVideoSourceAndTrack(
@@ -894,10 +896,8 @@
       interfaces->TestRunner()->ShouldGeneratePixelResults() &&
       !interfaces->TestRunner()->ShouldDumpAsAudio()) {
     CHECK(render_view()->GetWebView()->isAcceleratedCompositingActive());
-    interfaces->TestRunner()->DumpPixelsAsync(
-        render_view()->GetWebView(),
-        base::Bind(&BlinkTestRunner::OnPixelsDumpCompleted,
-                   base::Unretained(this)));
+    proxy()->CapturePixelsAsync(base::Bind(
+        &BlinkTestRunner::OnPixelsDumpCompleted, base::Unretained(this)));
     return;
   }