Revert of Make cc output surface creation async

cc/trees/thread_proxy.cc

Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index dddf112194a9960339bed5fe32f59b0eab9553e8..53fb3843d665b7416a1ecf2dd278d6034b8f3bb6 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -215,12 +215,13 @@
   }
 }
 
-void ThreadProxy::RequestNewOutputSurface() {
-  DCHECK(IsMainThread());
-  layer_tree_host()->RequestNewOutputSurface();
-}
-
-void ThreadProxy::SetOutputSurface(scoped_ptr<OutputSurface> output_surface) {
+void ThreadProxy::CreateAndInitializeOutputSurface() {
+  TRACE_EVENT0("cc", "ThreadProxy::DoCreateAndInitializeOutputSurface");
+  DCHECK(IsMainThread());
+
+  scoped_ptr<OutputSurface> output_surface =
+      layer_tree_host()->CreateOutputSurface();
+
   if (output_surface) {
     Proxy::ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
@@ -244,7 +245,7 @@
   if (!success) {
     Proxy::MainThreadTaskRunner()->PostTask(
         FROM_HERE,
-        base::Bind(&ThreadProxy::RequestNewOutputSurface,
+        base::Bind(&ThreadProxy::CreateAndInitializeOutputSurface,
                    main_thread_weak_ptr_));
   }
 }
@@ -1025,7 +1026,8 @@
   DCHECK(IsImplThread());
   Proxy::MainThreadTaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(&ThreadProxy::RequestNewOutputSurface, main_thread_weak_ptr_));
+      base::Bind(&ThreadProxy::CreateAndInitializeOutputSurface,
+                 main_thread_weak_ptr_));
 }
 
 DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) {