Split DumpPixelsAsync in pixel_dump.h into more granular functions.

content/shell/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 CONTENT_SHELL_TEST_RUNNER_WEB_TEST_RUNNER_H_
 #define CONTENT_SHELL_TEST_RUNNER_WEB_TEST_RUNNER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
   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;
+      blink::WebLocalFrame* frame,
+      base::OnceCallback<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|.
@@ skipping 15 matching lines @@
   virtual void InitializeWebViewWithMocks(blink::WebView* web_view) = 0;
 
   // Sets focus on the given view.  Internally tracks currently focused view,
   // to aid in defocusing previously focused views at the right time.
   virtual void SetFocus(blink::WebView* web_view, bool focus) = 0;
 };
 
 }  // namespace test_runner
 
 #endif  // CONTENT_SHELL_TEST_RUNNER_WEB_TEST_RUNNER_H_