Move SingleThreadProxy::LayoutAndUpdateLayers into LayerTreeHost directly.

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 17c43a2f2b2cbc90f3d48f6bdeaf85377e15863a..eb24f62f21d610fca6db5dbd54b5e56d4b34dadd 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -514,19 +514,6 @@ void SingleThreadProxy::PostFrameTimingEventsOnImplThread(
                                             main_frame_events.Pass());
 }
 
-void SingleThreadProxy::LayoutAndUpdateLayers() {
-  if (layer_tree_host_->output_surface_lost()) {
-    RequestNewOutputSurface();
-    // RequestNewOutputSurface could have synchronously created an output
-    // surface, so check again before returning.
-    if (layer_tree_host_->output_surface_lost())
-      return;
-  }
-
-  layer_tree_host_->Layout();
-  layer_tree_host_->UpdateLayers();
-}
-
 void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
   TRACE_EVENT0("cc,benchmark", "SingleThreadProxy::CompositeImmediately");
   DCHECK(Proxy::IsMainThread());