testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 167802e3cf36a3ca338c77473964e1d9c0036f30..014fd478208ceaabe6499a2a39871aacbe33d4c0 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -2,6 +2,7 @@
 // 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 "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
@@ -32,7 +33,6 @@
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/test_runner/gamepad_controller.h"
-#include "components/test_runner/layout_and_paint_async_then.h"
 #include "components/test_runner/pixel_dump.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
@@ -881,7 +881,7 @@ void BlinkTestRunner::CaptureDumpContinued() {
 #ifndef NDEBUG
   // Force a layout/paint by the end of the test to ensure test coverage of
   // incremental painting.
-  test_runner::LayoutAndPaintAsyncThen(
+  test_runner::CompositeAsyncThen(
       render_view()
           ->GetWebView()
           ->mainFrame()