Revert of cc: Defer first OutputSurface creation until client is ready

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 18 matching lines @@
 using blink::WebRect;
 using blink::WebRenderingStats;
 using blink::WebSize;
 
 namespace webkit {
 
 WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting() {}
 
 WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}
 
-void WebLayerTreeViewImplForTesting::Initialize() {
+bool WebLayerTreeViewImplForTesting::Initialize() {
   cc::LayerTreeSettings settings;
 
   // For web contents, layer transforms should scale up the contents of layers
   // to keep content always crisp when possible.
   settings.layer_transforms_should_scale_layer_contents = true;
 
   // Accelerated animations are enabled for unit tests.
   settings.accelerated_animation_enabled = true;
   layer_tree_host_ =
       cc::LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings);
-  DCHECK(layer_tree_host_);
+  if (!layer_tree_host_)
+    return false;
+  return true;
 }
 
 void WebLayerTreeViewImplForTesting::setSurfaceReady() {
   layer_tree_host_->SetLayerTreeHostClientReady();
 }
 
 void WebLayerTreeViewImplForTesting::setRootLayer(
     const blink::WebLayer& root) {
   layer_tree_host_->SetRootLayer(
       static_cast<const WebLayerImpl*>(&root)->layer());
@@ skipping 97 matching lines @@
 }
 
 scoped_refptr<cc::ContextProvider>
 WebLayerTreeViewImplForTesting::OffscreenContextProvider() {
   // Unit tests only run in single threaded mode.
   return webkit::gpu::TestContextProviderFactory::GetInstance()->
       OffscreenContextProviderForMainThread();
 }
 
 }  // namespace webkit