testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

components/test_runner/test_runner_for_specific_view.cc

Index: components/test_runner/test_runner_for_specific_view.cc
diff --git a/components/test_runner/test_runner_for_specific_view.cc b/components/test_runner/test_runner_for_specific_view.cc
index 30d5082a915b0131874a3a40f012c5aa81f87aa1..49f6ff06902b37655def70382badd6020f01cf73 100644
--- a/components/test_runner/test_runner_for_specific_view.cc
+++ b/components/test_runner/test_runner_for_specific_view.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 "components/test_runner/test_runner_for_specific_view.h"
 
 #include <stddef.h>
@@ -15,7 +16,6 @@
 #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"
@@ -212,19 +212,13 @@ base::Closure TestRunnerForSpecificView::CreateClosureThatPostsV8Callback(
                                    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));
 }