| Index: cc/layers/ui_resource_layer_unittest.cc
|
| diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc
|
| index fa277109c26347adecd874a003b66b3db2a59ff6..94efef486f59502f80be7ea2c3151076f5011558 100644
|
| --- a/cc/layers/ui_resource_layer_unittest.cc
|
| +++ b/cc/layers/ui_resource_layer_unittest.cc
|
| @@ -5,7 +5,6 @@
|
| #include "cc/layers/ui_resource_layer.h"
|
|
|
| #include "base/thread_task_runner_handle.h"
|
| -#include "cc/layers/layer_settings.h"
|
| #include "cc/resources/resource_provider.h"
|
| #include "cc/resources/scoped_ui_resource.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| @@ -30,9 +29,8 @@ namespace {
|
|
|
| class TestUIResourceLayer : public UIResourceLayer {
|
| public:
|
| - static scoped_refptr<TestUIResourceLayer> Create(
|
| - const LayerSettings& settings) {
|
| - return make_scoped_refptr(new TestUIResourceLayer(settings));
|
| + static scoped_refptr<TestUIResourceLayer> Create() {
|
| + return make_scoped_refptr(new TestUIResourceLayer());
|
| }
|
|
|
| UIResourceId GetUIResourceId() {
|
| @@ -42,10 +40,7 @@ class TestUIResourceLayer : public UIResourceLayer {
|
| }
|
|
|
| protected:
|
| - explicit TestUIResourceLayer(const LayerSettings& settings)
|
| - : UIResourceLayer(settings) {
|
| - SetIsDrawable(true);
|
| - }
|
| + TestUIResourceLayer() : UIResourceLayer() { SetIsDrawable(true); }
|
| ~TestUIResourceLayer() override {}
|
| };
|
|
|
| @@ -68,12 +63,10 @@ class UIResourceLayerTest : public testing::Test {
|
| FakeLayerTreeHostClient fake_client_;
|
| TestTaskGraphRunner task_graph_runner_;
|
| scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
|
| - LayerSettings layer_settings_;
|
| };
|
|
|
| TEST_F(UIResourceLayerTest, SetBitmap) {
|
| - scoped_refptr<UIResourceLayer> test_layer =
|
| - TestUIResourceLayer::Create(layer_settings_);
|
| + scoped_refptr<UIResourceLayer> test_layer = TestUIResourceLayer::Create();
|
| ASSERT_TRUE(test_layer.get());
|
| test_layer->SetBounds(gfx::Size(100, 100));
|
|
|
| @@ -97,8 +90,7 @@ TEST_F(UIResourceLayerTest, SetBitmap) {
|
| }
|
|
|
| TEST_F(UIResourceLayerTest, SetUIResourceId) {
|
| - scoped_refptr<TestUIResourceLayer> test_layer =
|
| - TestUIResourceLayer::Create(layer_settings_);
|
| + scoped_refptr<TestUIResourceLayer> test_layer = TestUIResourceLayer::Create();
|
| ASSERT_TRUE(test_layer.get());
|
| test_layer->SetBounds(gfx::Size(100, 100));
|
|
|
| @@ -130,8 +122,7 @@ TEST_F(UIResourceLayerTest, SetUIResourceId) {
|
| }
|
|
|
| TEST_F(UIResourceLayerTest, BitmapClearedOnSetUIResourceId) {
|
| - scoped_refptr<UIResourceLayer> test_layer =
|
| - TestUIResourceLayer::Create(layer_settings_);
|
| + scoped_refptr<UIResourceLayer> test_layer = TestUIResourceLayer::Create();
|
| ASSERT_TRUE(test_layer.get());
|
| test_layer->SetBounds(gfx::Size(100, 100));
|
|
|
|
|