Revert of Create RenderSurface on Effect Tree

cc/layers/layer_iterator_unittest.cc

Index: cc/layers/layer_iterator_unittest.cc
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index b9b3cf3d283d943007c2b4541f867d9cf6935d74..48a8635d35c9c187c84b0bbf04c33d241cb99d30 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -135,6 +135,7 @@ TEST_F(LayerIteratorTest, SimpleTree) {
   root_layer->AddChild(std::move(third));
   root_layer->AddChild(std::move(fourth));
 
+  root_layer->SetHasRenderSurface(true);
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   LayerImplList render_surface_layer_list;
@@ -182,6 +183,7 @@ TEST_F(LayerIteratorTest, ComplexTree) {
   root_layer->AddChild(std::move(root2));
   root_layer->AddChild(std::move(root3));
 
+  root_layer->SetHasRenderSurface(true);
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   LayerImplList render_surface_layer_list;
@@ -224,12 +226,12 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
   TestLayerImpl* root221_ptr = root221.get();
   TestLayerImpl* root231_ptr = root231.get();
 
-  root22->SetForceRenderSurface(true);
-  root23->SetForceRenderSurface(true);
-  root2->SetForceRenderSurface(true);
+  root22->SetHasRenderSurface(true);
   root22->AddChild(std::move(root221));
+  root23->SetHasRenderSurface(true);
   root23->AddChild(std::move(root231));
   root2->SetDrawsContent(false);
+  root2->SetHasRenderSurface(true);
   root2->AddChild(std::move(root21));
   root2->AddChild(std::move(root22));
   root2->AddChild(std::move(root23));
@@ -237,6 +239,7 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
   root_layer->AddChild(std::move(root2));
   root_layer->AddChild(std::move(root3));
 
+  root_layer->SetHasRenderSurface(true);
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   LayerImplList render_surface_layer_list;