testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

components/test_runner/test_runner_for_specific_view.cc

 // Copyright 2016 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.
 
+#include <components/test_runner/composite_async_then.h>
 #include "components/test_runner/test_runner_for_specific_view.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "components/test_runner/app_banner_client.h"
-#include "components/test_runner/layout_and_paint_async_then.h"
 #include "components/test_runner/layout_dump.h"
 #include "components/test_runner/mock_content_settings_client.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/mock_web_user_media_client.h"
 #include "components/test_runner/pixel_dump.h"
 #include "components/test_runner/spell_check_client.h"
 #include "components/test_runner/test_common.h"
 #include "components/test_runner/test_interfaces.h"
@@ skipping 176 matching lines @@
 base::Closure TestRunnerForSpecificView::CreateClosureThatPostsV8Callback(
     const v8::Local<v8::Function>& callback) {
   return base::Bind(&TestRunnerForSpecificView::PostTask,
                     weak_factory_.GetWeakPtr(),
                     base::Bind(&TestRunnerForSpecificView::InvokeV8Callback,
                                weak_factory_.GetWeakPtr(),
                                v8::UniquePersistent<v8::Function>(
                                    blink::mainThreadIsolate(), callback)));
 }
 
-void TestRunnerForSpecificView::LayoutAndPaintAsync() {
+void TestRunnerForSpecificView::CompositeAsyncThen(
+    v8::Local<v8::Function> callback) {
   // TODO(lfg, lukasza): TestRunnerForSpecificView assumes that there's a single
   // WebWidget for the entire view, but with out-of-process iframes there may be
   // multiple WebWidgets, one for each local root. We should look into making
   // this structure more generic.
-  test_runner::LayoutAndPaintAsyncThen(
-      web_view()->mainFrame()->toWebLocalFrame()->frameWidget(),
-      base::Closure());
-}
-
-void TestRunnerForSpecificView::LayoutAndPaintAsyncThen(
-    v8::Local<v8::Function> callback) {
-  test_runner::LayoutAndPaintAsyncThen(
+  test_runner::CompositeAsyncThen(
       web_view()->mainFrame()->toWebLocalFrame()->frameWidget(),
       CreateClosureThatPostsV8Callback(callback));
 }
 
 void TestRunnerForSpecificView::CapturePixelsAsyncThen(
     v8::Local<v8::Function> callback) {
   v8::UniquePersistent<v8::Function> persistent_callback(
       blink::mainThreadIsolate(), callback);
 
   web_test_proxy_base_->test_interfaces()->GetTestRunner()->DumpPixelsAsync(
@@ skipping 439 matching lines @@
 
 blink::WebView* TestRunnerForSpecificView::web_view() {
   return web_test_proxy_base_->web_view();
 }
 
 WebTestDelegate* TestRunnerForSpecificView::delegate() {
   return web_test_proxy_base_->delegate();
 }
 
 }  // namespace test_runner