Revert of Create RenderSurface on Effect Tree

cc/trees/occlusion_tracker_perftest.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/trees/occlusion_tracker.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_iterator.h"
@@ skipping 27 matching lines @@
         output_surface_(FakeOutputSurface::Create3d()) {}
   void CreateHost() {
     LayerTreeSettings settings;
     host_impl_ = LayerTreeHostImpl::Create(
         settings, &client_, &impl_task_runner_provider_, &stats_,
         &shared_bitmap_manager_, nullptr, &task_graph_runner_, 1);
     host_impl_->SetVisible(true);
     host_impl_->InitializeRenderer(output_surface_.get());
 
     scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(active_tree(), 1);
-    root_layer->SetForceRenderSurface(true);
+    root_layer->SetHasRenderSurface(true);
     active_tree()->SetRootLayer(std::move(root_layer));
   }
 
   LayerTreeImpl* active_tree() { return host_impl_->active_tree(); }
 
   void SetTestName(const std::string& name) { test_name_ = name; }
 
   void PrintResults() {
     CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest().";
     perf_test::PrintResult("occlusion_tracker_time",
@@ skipping 148 matching lines @@
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc