Revert of Make cc output surface creation async

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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 "android_webview/browser/hardware_renderer.h"
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_output_surface.h"
 #include "android_webview/browser/shared_renderer_state.h"
@@ skipping 227 matching lines @@
   gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
   {
     base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_,
                                          true);
     layer_tree_host_->SetNeedsRedrawRect(clip_);
     layer_tree_host_->Composite(gfx::FrameTime::Now());
   }
   gl_surface_->ResetBackingFrameBufferObject();
 }
 
-void HardwareRenderer::RequestNewOutputSurface(bool fallback) {
+scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface(
+    bool fallback) {
   // Android webview does not support losing output surface.
   DCHECK(!fallback);
   scoped_refptr<cc::ContextProvider> context_provider =
       CreateContext(gl_surface_,
                     DeferredGpuCommandService::GetInstance());
   scoped_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(context_provider));
   output_surface_ = output_surface_holder.get();
-  layer_tree_host_->SetOutputSurface(
-      output_surface_holder.PassAs<cc::OutputSurface>());
+  return output_surface_holder.PassAs<cc::OutputSurface>();
 }
 
 void HardwareRenderer::UnusedResourcesAreAvailable() {
   cc::ReturnedResourceArray returned_resources;
   resource_collection_->TakeUnusedResourcesForChildCompositor(
       &returned_resources);
   shared_renderer_state_->InsertReturnedResources(returned_resources);
 }
 
 }  // namespace android_webview