Revert of Make cc output surface creation async

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 97b06bc4894f892b1c2ba80b5aadf3500052d9c9..0e8c81c83d4e86c0ea2764ca1b535f77ae49f175 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -107,16 +107,15 @@
   UpdateBackgroundAnimateTicking();
 }
 
-void SingleThreadProxy::RequestNewOutputSurface() {
+void SingleThreadProxy::CreateAndInitializeOutputSurface() {
+  TRACE_EVENT0(
+      "cc", "SingleThreadProxy::CreateAndInitializeOutputSurface");
   DCHECK(Proxy::IsMainThread());
   DCHECK(layer_tree_host_->output_surface_lost());
-  layer_tree_host_->RequestNewOutputSurface();
-}
-
-void SingleThreadProxy::SetOutputSurface(
-    scoped_ptr<OutputSurface> output_surface) {
-  DCHECK(Proxy::IsMainThread());
-  DCHECK(layer_tree_host_->output_surface_lost());
+
+  scoped_ptr<OutputSurface> output_surface =
+      layer_tree_host_->CreateOutputSurface();
+
   renderer_capabilities_for_main_thread_ = RendererCapabilities();
 
   bool success = !!output_surface;
@@ -136,7 +135,7 @@
   } else if (Proxy::MainThreadTaskRunner()) {
     MainThreadTaskRunner()->PostTask(
         FROM_HERE,
-        base::Bind(&SingleThreadProxy::RequestNewOutputSurface,
+        base::Bind(&SingleThreadProxy::CreateAndInitializeOutputSurface,
                    weak_factory_.GetWeakPtr()));
   }
 }
@@ -665,10 +664,10 @@
   if (Proxy::MainThreadTaskRunner()) {
     MainThreadTaskRunner()->PostTask(
         FROM_HERE,
-        base::Bind(&SingleThreadProxy::RequestNewOutputSurface,
+        base::Bind(&SingleThreadProxy::CreateAndInitializeOutputSurface,
                    weak_factory_.GetWeakPtr()));
   } else {
-    RequestNewOutputSurface();
+    CreateAndInitializeOutputSurface();
   }
 }