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

components/test_runner/web_test_proxy.h

Index: components/test_runner/web_test_proxy.h
diff --git a/components/test_runner/web_test_proxy.h b/components/test_runner/web_test_proxy.h
index 443cd7e8506bbd88c3b9b5033ca2202d5021d7da..a9b86c0e472aa40314c0892681963e7acb3e77cf 100644
--- a/components/test_runner/web_test_proxy.h
+++ b/components/test_runner/web_test_proxy.h
@@ -13,7 +13,6 @@
 #include "build/build_config.h"
 #include "components/test_runner/test_runner_export.h"
 #include "components/test_runner/web_task.h"
-#include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
@@ -24,12 +23,10 @@
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 
-class SkBitmap;
-class SkCanvas;
-
 namespace blink {
 class WebDragData;
 class WebFileChooserCompletion;
+class WebImage;
 class WebLocalFrame;
 class WebSpeechRecognizer;
 class WebSpellCheckClient;
@@ -72,12 +69,6 @@ class TEST_RUNNER_EXPORT WebTestProxyBase {
                              blink::WebTextDirection sub_message_hint);
 
   std::string DumpBackForwardLists();
-  void CapturePixelsForPrinting(
-      const base::Callback<void(const SkBitmap&)>& callback);
-  void CopyImageAtAndCapturePixels(
-      int x, int y, const base::Callback<void(const SkBitmap&)>& callback);
-  void CapturePixelsAsync(
-      const base::Callback<void(const SkBitmap&)>& callback);
 
   void LayoutAndPaintAsyncThen(const base::Closure& callback);
 
@@ -127,10 +118,6 @@ class TEST_RUNNER_EXPORT WebTestProxyBase {
 
  private:
   void AnimateNow();
-  void DrawSelectionRect(SkCanvas* canvas);
-  void DidCapturePixelsAsync(
-      const base::Callback<void(const SkBitmap&)>& callback,
-      const SkBitmap& bitmap);
 
   TestInterfaces* test_interfaces_;
   WebTestDelegate* delegate_;
@@ -138,8 +125,6 @@ class TEST_RUNNER_EXPORT WebTestProxyBase {
 
   WebTaskList task_list_;
 
-  blink::WebImage drag_image_;
-
   scoped_ptr<SpellCheckClient> spellcheck_;
 
   bool animate_scheduled_;