Revert of Create RenderSurface on Effect Tree

cc/test/layer_tree_host_common_test.h

 // 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.
 
 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 
-#include <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/layer_settings.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/property_tree.h"
@@ skipping 41 matching lines @@
                                     const gfx::Size& bounds,
                                     bool flatten_transform,
                                     bool is_3d_sorted);
 
   void 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);
-
-  void 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,
                                     bool create_render_surface);
 
   void 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 32 matching lines @@
   void ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* layer);
   void ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* layer);
 
   void ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(
       LayerImpl* root_layer);
 
   LayerImplList* render_surface_layer_list_impl() const {
     return render_surface_layer_list_impl_.get();
   }
 
-  LayerImplList* update_layer_list_impl() const {
-    return update_layer_list_impl_.get();
-  }
-  bool UpdateLayerListImplContains(int id) const {
-    return std::count_if(
-               update_layer_list_impl_->begin(), update_layer_list_impl_->end(),
-               [id](LayerImpl* layer) { return layer->id() == id; }) != 0;
-  }
-
   const LayerList& update_layer_list() const { return update_layer_list_; }
   bool UpdateLayerListContains(int id) const;
 
   int render_surface_layer_list_count() const {
     return render_surface_layer_list_count_;
   }
 
   const LayerSettings& layer_settings() { return layer_settings_; }
 
  private:
   scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_;
   LayerList update_layer_list_;
-  scoped_ptr<LayerImplList> update_layer_list_impl_;
   LayerSettings layer_settings_;
 
   int render_surface_layer_list_count_;
 };
 
 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
                                 public testing::Test {
  public:
   LayerTreeHostCommonTest();
   explicit LayerTreeHostCommonTest(const LayerTreeSettings& settings);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_