Index: ui/compositor/layer_unittest.cc |
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc |
index 8421bfb1a3bfab4dfd74d801615fac520d888050..f24ad4659b42b8c3078d943566fed31b3cbc8fc9 100644 |
--- a/ui/compositor/layer_unittest.cc |
+++ b/ui/compositor/layer_unittest.cc |
@@ -734,14 +734,12 @@ TEST_F(LayerWithNullDelegateTest, EscapedDebugNames) { |
TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) { |
std::unique_ptr<Layer> l1(CreateLayer(LAYER_SOLID_COLOR)); |
l1->SetFillsBoundsOpaquely(true); |
- l1->SetForceRenderSurface(true); |
l1->SetVisible(false); |
l1->SetBounds(gfx::Rect(4, 5)); |
EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque()); |
- EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree()); |
EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds()); |
@@ -758,7 +756,6 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) { |
EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque()); |
- EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree()); |
EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds()); |
EXPECT_FALSE(callback1_run); |
@@ -776,7 +773,6 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) { |
EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque()); |
- EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree()); |
EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds()); |
EXPECT_TRUE(callback2_run); |
@@ -795,7 +791,6 @@ TEST_F(LayerWithNullDelegateTest, SwitchLayerPreservesCCLayerState) { |
EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque()); |
- EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface()); |
EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree()); |
EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds()); |
EXPECT_FALSE(callback3_run); |