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

components/test_runner/web_test_proxy.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #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"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #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;
 class WebString;
 class WebView;
 class WebWidget;
 struct WebFileChooserParams;
 struct WebPoint;
 struct WebWindowFeatures;
 }
@@ skipping 22 matching lines @@
 
   blink::WebSpellCheckClient* GetSpellCheckClient() const;
   bool RunFileChooser(const blink::WebFileChooserParams& params,
                       blink::WebFileChooserCompletion* completion);
   void ShowValidationMessage(const blink::WebString& main_message,
                              blink::WebTextDirection main_message_hint,
                              const blink::WebString& sub_message,
                              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);
 
   void GetScreenOrientationForTesting(blink::WebScreenInfo&);
   MockWebSpeechRecognizer* GetSpeechRecognizerMock();
   MockCredentialManagerClient* GetCredentialManagerClientMock();
 
   WebTaskList* mutable_task_list() { return &task_list_; }
 
   blink::WebView* GetWebView() const;
@@ skipping 29 matching lines @@
   void DidFocus();
   void SetToolTipText(const blink::WebString& text,
                       blink::WebTextDirection direction);
   void DidChangeLocationWithinPage(blink::WebLocalFrame* frame);
   void ResetInputMethod();
 
   blink::WebString acceptLanguages();
 
  private:
   void AnimateNow();
+  void DrawSelectionRect(SkCanvas* canvas);
+  void DidCapturePixelsAsync(
+      const base::Callback<void(const SkBitmap&)>& callback,
+      const SkBitmap& bitmap);
 
   TestInterfaces* test_interfaces_;
   WebTestDelegate* delegate_;
   blink::WebWidget* web_widget_;
 
   WebTaskList task_list_;
 
+  blink::WebImage drag_image_;
+
   scoped_ptr<SpellCheckClient> spellcheck_;
 
   bool animate_scheduled_;
 
   scoped_ptr<MockCredentialManagerClient> credential_manager_client_;
   scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
 };
@@ skipping 107 matching lines @@
 
  private:
   virtual ~WebTestProxy() {}
 
   DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_