testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

content/renderer/gpu/render_widget_compositor.h

Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index f8408bb317c603df5085c56dec2ae4af4b75ab46..b732552d58d61fe2fc13815712b11318f31a6314 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -121,8 +121,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
   void setNeedsBeginFrame() override;
   void setNeedsCompositorUpdate() override;
   void didStopFlinging() override;
-  void layoutAndPaintAsync(
-      blink::WebLayoutAndPaintAsyncCallback* callback) override;
   void compositeAndReadbackAsync(
       blink::WebCompositeAndReadbackAsyncCallback* callback) override;
   void setDeferCommits(bool defer_commits) override;
@@ -202,8 +200,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
   cc::LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
 
  private:
-  void LayoutAndUpdateLayers();
-  void InvokeLayoutAndPaintCallback();
   bool CompositeIsSynchronous() const;
   void SynchronouslyComposite();
 
@@ -213,7 +209,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
   std::unique_ptr<cc::LayerTreeHost> layer_tree_host_;
   bool never_visible_;
 
-  blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_;
   std::unique_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
 
   cc::RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;