Revert of Make cc output surface creation async

cc/trees/occlusion_tracker_unittest.cc

 // Copyright 2012 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 "cc/trees/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 158 matching lines @@
   static void RecursiveUpdateNumChildren(LayerType* layer) {
     FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(layer);
   }
 };
 
 int OcclusionTrackerTestImplThreadTypes::next_layer_impl_id = 1;
 
 template <typename Types> class OcclusionTrackerTest : public testing::Test {
  protected:
   explicit OcclusionTrackerTest(bool opaque_layers)
-      : opaque_layers_(opaque_layers),
-        client_(FakeLayerTreeHostClient::DIRECT_3D),
-        host_(FakeLayerTreeHost::Create(&client_)) {}
+      : opaque_layers_(opaque_layers), host_(FakeLayerTreeHost::Create()) {}
 
   virtual void RunMyTest() = 0;
 
   virtual void TearDown() { DestroyLayers(); }
 
   typename Types::HostType* GetHost();
 
   typename Types::ContentLayerType* CreateRoot(const gfx::Transform& transform,
                                                const gfx::PointF& position,
                                                const gfx::Size& bounds) {
@@ skipping 244 matching lines @@
   void SetMask(Layer* owning_layer, scoped_refptr<Layer> layer) {
     owning_layer->SetMaskLayer(layer.get());
     mask_layers_.push_back(layer);
   }
 
   void SetMask(LayerImpl* owning_layer, scoped_ptr<LayerImpl> layer) {
     owning_layer->SetMaskLayer(layer.Pass());
   }
 
   bool opaque_layers_;
-  FakeLayerTreeHostClient client_;
   scoped_ptr<FakeLayerTreeHost> host_;
   // These hold ownership of the layers for the duration of the test.
   typename Types::LayerPtrType root_;
   scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_;
   LayerImplList render_surface_layer_list_impl_;
   typename Types::TestLayerIterator layer_iterator_begin_;
   typename Types::TestLayerIterator layer_iterator_;
   typename Types::LayerType* last_layer_visited_;
   LayerList replica_layers_;
   LayerList mask_layers_;
@@ skipping 2852 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc