Delete LayerImpl::GetRenderSurface.

cc/layers/effect_tree_layer_list_iterator_unittest.cc

 // Copyright 2017 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/layers/effect_tree_layer_list_iterator.h"
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_layer_tree_host.h"
+#include "cc/test/layer_test_common.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 class TestLayerImpl : public LayerImpl {
  public:
   static std::unique_ptr<TestLayerImpl> Create(LayerTreeImpl* tree, int id) {
     return base::WrapUnique(new TestLayerImpl(tree, id));
   }
   ~TestLayerImpl() override {}
 
   int count_;
 
  private:
   explicit TestLayerImpl(LayerTreeImpl* tree, int id)
       : LayerImpl(tree, id), count_(-1) {
     SetBounds(gfx::Size(100, 100));
     SetPosition(gfx::PointF());
     SetDrawsContent(true);
   }
 };
 
 #define EXPECT_COUNT(layer, target, contrib, itself)                      \
-  if (layer->GetRenderSurface()) {                                        \
+  if (GetRenderSurface(layer)) {                                          \
     EXPECT_EQ(target, target_surface_count_[layer->effect_tree_index()]); \
     EXPECT_EQ(contrib,                                                    \
               contributing_surface_count_[layer->effect_tree_index()]);   \
   }                                                                       \
   EXPECT_EQ(itself, layer->count_);
 
 class EffectTreeLayerListIteratorTest : public testing::Test {
  public:
   EffectTreeLayerListIteratorTest()
       : host_impl_(&task_runner_provider_, &task_graph_runner_), id_(1) {}
@@ skipping 196 matching lines @@
   EXPECT_COUNT(root21_ptr, -1, -1, 9);
   EXPECT_COUNT(root22_ptr, 7, 8, 6);
   EXPECT_COUNT(root221_ptr, -1, -1, 5);
   EXPECT_COUNT(root23_ptr, 3, 4, 2);
   EXPECT_COUNT(root231_ptr, -1, -1, 1);
   EXPECT_COUNT(root3_ptr, -1, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc