Revert of Make cc output surface creation async

mojo/examples/compositor_app/compositor_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/examples/compositor_app/compositor_host.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/context_provider.h"
@@ skipping 58 matching lines @@
   child_transform.Rotate(child_rotation_degrees);
   child_layer_->SetTransform(child_transform);
   tree_->SetNeedsAnimate();
 }
 
 void CompositorHost::Layout() {}
 void CompositorHost::ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
                                          float page_scale,
                                          float top_controls_delta) {}
 
-void CompositorHost::RequestNewOutputSurface(bool fallback) {
-  tree_->SetOutputSurface(make_scoped_ptr(new cc::OutputSurface(
-      new ContextProviderMojo(command_buffer_handle_.Pass()))));
+scoped_ptr<cc::OutputSurface> CompositorHost::CreateOutputSurface(
+    bool fallback) {
+  return make_scoped_ptr(
+      new cc::OutputSurface(
+          new ContextProviderMojo(command_buffer_handle_.Pass())));
 }
 
 void CompositorHost::DidInitializeOutputSurface() {
 }
 
 void CompositorHost::WillCommit() {}
 void CompositorHost::DidCommit() {}
 void CompositorHost::DidCommitAndDrawFrame() {}
 void CompositorHost::DidCompleteSwapBuffers() {}
 
 }  // namespace examples
 }  // namespace mojo