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

components/test_runner/web_test_runner.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_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_WEB_TEST_RUNNER_H_
 
 #include <string>
 #include <vector>
 
-#include "base/callback_forward.h"
-
-class SkBitmap;
-
 namespace base {
 class DictionaryValue;
 }
 
 namespace blink {
 class WebContentSettingsClient;
 class WebLocalFrame;
-class WebView;
 }
 
 namespace test_runner {
 
 class WebTestRunner {
  public:
   // Returns a mock WebContentSettings that is used for layout tests. An
   // embedder should use this for all WebViews it creates.
   virtual blink::WebContentSettingsClient* GetWebContentSettings() const = 0;
 
   // After WebTestDelegate::TestFinished was invoked, the following methods
   // can be used to determine what kind of dump the main WebTestProxy can
   // provide.
 
   // If true, WebTestDelegate::audioData returns an audio dump and no text
   // or pixel results are available.
   virtual bool ShouldDumpAsAudio() const = 0;
   virtual void GetAudioData(std::vector<unsigned char>* buffer_view) const = 0;
 
   // Reports if tests requested a recursive layout dump of all frames
   // (i.e. by calling testRunner.dumpChildFramesAsText() from javascript).
   virtual bool IsRecursiveLayoutDumpRequested() = 0;
 
   // Dumps layout of |frame| using the mode requested by the current test
   // (i.e. text mode if testRunner.dumpAsText() was called from javascript).
   virtual std::string DumpLayout(blink::WebLocalFrame* frame) = 0;
 
-  // Snapshots image of |web_view| using the mode requested by the current test
-  // and calls |callback| with the result.  Caller needs to ensure that
-  // |web_view| stays alive until |callback| is called.
-  virtual void DumpPixelsAsync(
-      blink::WebView* web_view,
-      const base::Callback<void(const SkBitmap&)>& callback) = 0;
-
   // Replicates changes to layout test runtime flags
   // (i.e. changes that happened in another renderer).
   // See also WebTestDelegate::OnLayoutTestRuntimeFlagsChanged.
   virtual void ReplicateLayoutTestRuntimeFlagsChanges(
       const base::DictionaryValue& changed_values) = 0;
 
   // If custom text dump is present (i.e. if testRunner.setCustomTextOutput has
   // been called from javascript), then returns |true| and populates the
   // |custom_text_dump| argument.  Otherwise returns |false|.
   virtual bool HasCustomTextDump(std::string* custom_text_dump) const = 0;
 
   // Returns true if the call to WebTestProxy::captureTree will invoke
   // WebTestDelegate::captureHistoryForWindow.
   virtual bool ShouldDumpBackForwardList() const = 0;
 
   // Returns true if WebTestProxy::capturePixels should be invoked after
   // capturing text results.
   virtual bool ShouldGeneratePixelResults() = 0;
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_RUNNER_H_