testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

content/shell/renderer/layout_test/blink_test_runner.cc

 // Copyright (c) 2012 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 "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 #include <memory>
 #include <utility>
 
@@ skipping 10 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #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"
 #include "components/test_runner/web_test_runner.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/media_stream_utils.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 828 matching lines @@
     interfaces->TestRunner()->DumpPixelsAsync(
         render_view()->GetWebView(),
         base::Bind(&BlinkTestRunner::OnPixelsDumpCompleted,
                    base::Unretained(this)));
     return;
   }
 
 #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()
           ->toWebLocalFrame()
           ->frameWidget(),
       base::Bind(&BlinkTestRunner::CaptureDumpComplete,
                  base::Unretained(this)));
 #else
   CaptureDumpComplete();
 #endif
@@ skipping 119 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content