Revert of Make cc output surface creation async

content/test/web_layer_tree_view_impl_for_testing.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 "content/test/web_layer_tree_view_impl_for_testing.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/switches.h"
@@ skipping 124 matching lines @@
 }
 
 void WebLayerTreeViewImplForTesting::Layout() {
 }
 
 void WebLayerTreeViewImplForTesting::ApplyViewportDeltas(
     const gfx::Vector2d& scroll_delta,
     float page_scale,
     float top_controls_delta) {}
 
-void WebLayerTreeViewImplForTesting::RequestNewOutputSurface(
-    bool fallback) {
-  layer_tree_host_->SetOutputSurface(make_scoped_ptr(
-      new cc::OutputSurface(cc::TestContextProvider::Create())));
+scoped_ptr<cc::OutputSurface>
+WebLayerTreeViewImplForTesting::CreateOutputSurface(bool fallback) {
+  return make_scoped_ptr(
+      new cc::OutputSurface(cc::TestContextProvider::Create()));
 }
 
 void WebLayerTreeViewImplForTesting::registerViewportLayers(
     const blink::WebLayer* pageScaleLayer,
     const blink::WebLayer* innerViewportScrollLayer,
     const blink::WebLayer* outerViewportScrollLayer) {
   layer_tree_host_->RegisterViewportLayers(
       static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(),
       static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer)
           ->layer(),
@@ skipping 12 matching lines @@
 
 void WebLayerTreeViewImplForTesting::registerSelection(
     const blink::WebSelectionBound& start,
     const blink::WebSelectionBound& end) {
 }
 
 void WebLayerTreeViewImplForTesting::clearSelection() {
 }
 
 }  // namespace content