Moving RenderSurface creation outside of CalcDrawProps

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 167b65a0a2ecfb629fab2472949b5bc59ddf238a..3e8697996a73663625fcbbdefdf99e9038ebb538 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -48,6 +48,7 @@
 #include "cc/test/fake_video_frame_provider.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_test_common.h"
+#include "cc/test/layer_tree_test.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_web_graphics_context_3d.h"
@@ -169,12 +170,13 @@ class LayerTreeHostImplTest : public testing::Test,
 
   bool CreateHostImpl(const LayerTreeSettings& settings,
                       scoped_ptr<OutputSurface> output_surface) {
-    host_impl_ = LayerTreeHostImpl::Create(settings,
-                                           this,
-                                           &proxy_,
-                                           &stats_instrumentation_,
-                                           shared_bitmap_manager_.get(),
-                                           0);
+    host_impl_ =
+        PseudoSyncingLayerTreeHostImpl::Create(settings,
+                                               this,
+                                               &proxy_,
+                                               &stats_instrumentation_,
+                                               shared_bitmap_manager_.get(),
+                                               0);
     bool init = host_impl_->InitializeRenderer(output_surface.Pass());
     host_impl_->SetViewportSize(gfx::Size(10, 10));
     return init;
@@ -1315,7 +1317,8 @@ TEST_F(LayerTreeHostImplTest, PageScaleAnimationNoOp) {
   }
 }
 
-class LayerTreeHostImplOverridePhysicalTime : public LayerTreeHostImpl {
+class LayerTreeHostImplOverridePhysicalTime
+    : public PseudoSyncingLayerTreeHostImpl {
  public:
   LayerTreeHostImplOverridePhysicalTime(
       const LayerTreeSettings& settings,
@@ -1323,12 +1326,12 @@ class LayerTreeHostImplOverridePhysicalTime : public LayerTreeHostImpl {
       Proxy* proxy,
       SharedBitmapManager* manager,
       RenderingStatsInstrumentation* rendering_stats_instrumentation)
-      : LayerTreeHostImpl(settings,
-                          client,
-                          proxy,
-                          rendering_stats_instrumentation,
-                          manager,
-                          0) {}
+      : PseudoSyncingLayerTreeHostImpl(settings,
+                                       client,
+                                       proxy,
+                                       rendering_stats_instrumentation,
+                                       manager,
+                                       0) {}
 
   virtual base::TimeTicks CurrentFrameTimeTicks() OVERRIDE {
     return fake_current_physical_time_;
@@ -4168,12 +4171,12 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl =
-      LayerTreeHostImpl::Create(settings,
-                                this,
-                                &proxy_,
-                                &stats_instrumentation_,
-                                shared_bitmap_manager.get(),
-                                0);
+      PseudoSyncingLayerTreeHostImpl::Create(settings,
+                                             this,
+                                             &proxy_,
+                                             &stats_instrumentation_,
+                                             shared_bitmap_manager.get(),
+                                             0);
   layer_tree_host_impl->InitializeRenderer(output_surface.Pass());
   layer_tree_host_impl->SetViewportSize(gfx::Size(500, 500));
 
@@ -4465,8 +4468,9 @@ static scoped_ptr<LayerTreeHostImpl> SetupLayersForOpacity(
 
   LayerTreeSettings settings;
   settings.partial_swap_enabled = partial_swap;
-  scoped_ptr<LayerTreeHostImpl> my_host_impl = LayerTreeHostImpl::Create(
-      settings, client, proxy, stats_instrumentation, manager, 0);
+  scoped_ptr<LayerTreeHostImpl> my_host_impl =
+      PseudoSyncingLayerTreeHostImpl::Create(
+          settings, client, proxy, stats_instrumentation, manager, 0);
   my_host_impl->InitializeRenderer(output_surface.Pass());
   my_host_impl->SetViewportSize(gfx::Size(100, 100));
 
@@ -5738,12 +5742,13 @@ TEST_F(LayerTreeHostImplTestDeferredInitialize, Fails) {
 // doesn't support memory management extensions.
 TEST_F(LayerTreeHostImplTest, DefaultMemoryAllocation) {
   LayerTreeSettings settings;
-  host_impl_ = LayerTreeHostImpl::Create(settings,
-                                         this,
-                                         &proxy_,
-                                         &stats_instrumentation_,
-                                         shared_bitmap_manager_.get(),
-                                         0);
+  host_impl_ =
+      PseudoSyncingLayerTreeHostImpl::Create(settings,
+                                             this,
+                                             &proxy_,
+                                             &stats_instrumentation_,
+                                             shared_bitmap_manager_.get(),
+                                             0);
 
   scoped_ptr<OutputSurface> output_surface(
       FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()));
@@ -5783,7 +5788,7 @@ TEST_F(LayerTreeHostImplTest, MemoryPolicy) {
   // when visible.
   LayerTreeSettings settings;
   settings.gpu_rasterization_enabled = true;
-  host_impl_ = LayerTreeHostImpl::Create(
+  host_impl_ = PseudoSyncingLayerTreeHostImpl::Create(
       settings, this, &proxy_, &stats_instrumentation_, NULL, 0);
   host_impl_->SetUseGpuRasterization(true);
   host_impl_->SetVisible(true);