Update from https://crrev.com/309717

cc/test/layer_tree_host_common_test.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 "cc/test/layer_tree_host_common_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 
 namespace cc {
 
 LayerTreeHostCommonTestBase::LayerTreeHostCommonTestBase()
     : client_(FakeLayerTreeHostClient::DIRECT_3D),
       render_surface_layer_list_count_(0) {
 }
 
 LayerTreeHostCommonTestBase::~LayerTreeHostCommonTestBase() {
 }
 
 void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     Layer* layer,
     const gfx::Transform& transform,
     const gfx::Point3F& transform_origin,
     const gfx::PointF& position,
     const gfx::Size& bounds,
     bool flatten_transform,
     bool is_3d_sorted) {
-  SetLayerPropertiesForTestingInternal<Layer>(layer,
-                                              transform,
-                                              transform_origin,
-                                              position,
-                                              bounds,
-                                              flatten_transform,
-                                              is_3d_sorted);
+  SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
+                                       position, bounds, flatten_transform,
+                                       is_3d_sorted);
 }
 
 void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     LayerImpl* layer,
     const gfx::Transform& transform,
     const gfx::Point3F& transform_origin,
     const gfx::PointF& position,
     const gfx::Size& bounds,
     bool flatten_transform,
-    bool is_3d_sorted) {
-  SetLayerPropertiesForTestingInternal<LayerImpl>(layer,
-                                                  transform,
-                                                  transform_origin,
-                                                  position,
-                                                  bounds,
-                                                  flatten_transform,
-                                                  is_3d_sorted);
+    bool is_3d_sorted,
+    bool create_render_surface) {
+  SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
+                                       position, bounds, flatten_transform,
+                                       is_3d_sorted);
+  if (create_render_surface) {
+    layer->SetHasRenderSurface(true);
+  }
+
   layer->SetContentBounds(bounds);
 }
 
 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     Layer* root_layer,
     float device_scale_factor,
     float page_scale_factor,
     Layer* page_scale_application_layer,
     bool can_use_lcd_text,
     bool layers_always_allowed_lcd_text) {
@@ skipping 51 matching lines @@
 
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 scoped_ptr<FakeLayerTreeHost>
 LayerTreeHostCommonTestBase::CreateFakeLayerTreeHost() {
   return FakeLayerTreeHost::Create(&client_);
 }
 
 }  // namespace cc