| Index: cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| index 3f01c54a174ce0bcfc5434de699b2ce1bf1c7b17..4c8b49b5b59dadf1ce0e6db180bb88b6a6f7ffcf 100644
|
| --- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| +++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| @@ -130,13 +130,13 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest,
|
| TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
|
| LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
|
| ASSERT_TRUE(scroll_layer);
|
| - EXPECT_SIZE_EQ(gfx::Size(200, 200), scroll_layer->bounds());
|
| + EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds());
|
|
|
| EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation());
|
|
|
| // Shrink along X axis, horizontal scrollbar should appear.
|
| clip_layer_->SetBounds(gfx::Size(100, 200));
|
| - EXPECT_SIZE_EQ(gfx::Size(100, 200), clip_layer_->bounds());
|
| + EXPECT_EQ(gfx::Size(100, 200), clip_layer_->bounds());
|
|
|
| scrollbar_controller_->DidScrollBegin();
|
|
|
| @@ -148,7 +148,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
|
| // Shrink along Y axis and expand along X, horizontal scrollbar
|
| // should disappear.
|
| clip_layer_->SetBounds(gfx::Size(200, 100));
|
| - EXPECT_SIZE_EQ(gfx::Size(200, 100), clip_layer_->bounds());
|
| + EXPECT_EQ(gfx::Size(200, 100), clip_layer_->bounds());
|
|
|
| scrollbar_controller_->DidScrollBegin();
|
|
|
| @@ -161,13 +161,13 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
|
| TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
|
| LayerImpl* scroll_layer = host_impl_.active_tree()->LayerById(1);
|
| ASSERT_TRUE(scroll_layer);
|
| - EXPECT_SIZE_EQ(gfx::Size(200, 200), scroll_layer->bounds());
|
| + EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds());
|
|
|
| EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation());
|
|
|
| // Shrink along X axis, vertical scrollbar should remain invisible.
|
| clip_layer_->SetBounds(gfx::Size(100, 200));
|
| - EXPECT_SIZE_EQ(gfx::Size(100, 200), clip_layer_->bounds());
|
| + EXPECT_EQ(gfx::Size(100, 200), clip_layer_->bounds());
|
|
|
| scrollbar_controller_->DidScrollBegin();
|
|
|
| @@ -178,7 +178,7 @@ TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, HideOnResize) {
|
|
|
| // Shrink along Y axis and expand along X, vertical scrollbar should appear.
|
| clip_layer_->SetBounds(gfx::Size(200, 100));
|
| - EXPECT_SIZE_EQ(gfx::Size(200, 100), clip_layer_->bounds());
|
| + EXPECT_EQ(gfx::Size(200, 100), clip_layer_->bounds());
|
|
|
| scrollbar_controller_->DidScrollBegin();
|
|
|
|
|