Index: cc/input/top_controls_manager_unittest.cc |
diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc |
index 4befa150a1311a1317b1f2f782f1ea0e2eae0ce1..16d0e5d21b1b32e45c5f733aa5fcf18daa804ac8 100644 |
--- a/cc/input/top_controls_manager_unittest.cc |
+++ b/cc/input/top_controls_manager_unittest.cc |
@@ -409,9 +409,8 @@ |
TEST(TopControlsManagerTest, GrowingHeightKeepsTopControlsHidden) { |
MockTopControlsManagerClient client(0.f, 0.5f, 0.5f); |
TopControlsManager* manager = client.manager(); |
- client.SetTopControlsHeight(1.f); |
manager->UpdateTopControlsState(HIDDEN, HIDDEN, false); |
- EXPECT_EQ(-1.f, manager->ControlsTopOffset()); |
+ EXPECT_EQ(0.f, manager->ControlsTopOffset()); |
EXPECT_EQ(0.f, manager->ContentTopOffset()); |
client.SetTopControlsHeight(50.f); |
@@ -446,50 +445,5 @@ |
EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset()); |
} |
-TEST(TopControlsManagerTest, ZeroTopControlsHeightScrolling) { |
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f); |
- client.SetCurrentTopControlsShownRatio(0.f); |
- TopControlsManager* manager = client.manager(); |
- manager->UpdateTopControlsState(BOTH, BOTH, false); |
- |
- manager->ScrollBegin(); |
- EXPECT_FLOAT_EQ(-10.f, manager->ScrollBy(gfx::Vector2dF(0.f, -10.f)).y()); |
- EXPECT_FLOAT_EQ(0.f, manager->TopControlsShownRatio()); |
- |
- client.SetTopControlsHeight(20.f); |
- EXPECT_FLOAT_EQ(0.f, manager->TopControlsShownRatio()); |
- |
- EXPECT_FLOAT_EQ(0.f, manager->ScrollBy(gfx::Vector2dF(0.f, -15.f)).y()); |
- EXPECT_FLOAT_EQ(0.75f, manager->TopControlsShownRatio()); |
- client.SetTopControlsHeight(0.f); |
- manager->ScrollEnd(); |
- |
- EXPECT_FALSE(manager->animation()); |
- EXPECT_FLOAT_EQ(1.f, manager->TopControlsShownRatio()); |
-} |
- |
-TEST(TopControlsManagerTest, ZeroTopControlsHeightAnimating) { |
- MockTopControlsManagerClient client(0.f, 0.5f, 0.5f); |
- client.SetCurrentTopControlsShownRatio(0.f); |
- TopControlsManager* manager = client.manager(); |
- |
- manager->UpdateTopControlsState(BOTH, HIDDEN, false); |
- EXPECT_FLOAT_EQ(0.f, manager->TopControlsShownRatio()); |
- manager->UpdateTopControlsState(BOTH, SHOWN, false); |
- EXPECT_FLOAT_EQ(1.f, manager->TopControlsShownRatio()); |
- |
- manager->UpdateTopControlsState(BOTH, HIDDEN, true); |
- EXPECT_FLOAT_EQ(0.f, manager->TopControlsShownRatio()); |
- EXPECT_FALSE(manager->animation()); |
- manager->UpdateTopControlsState(BOTH, SHOWN, true); |
- EXPECT_FLOAT_EQ(1.f, manager->TopControlsShownRatio()); |
- EXPECT_FALSE(manager->animation()); |
- |
- client.SetCurrentTopControlsShownRatio(0.3f); |
- manager->MainThreadHasStoppedFlinging(); |
- EXPECT_FALSE(manager->animation()); |
- EXPECT_FLOAT_EQ(0.f, manager->TopControlsShownRatio()); |
-} |
- |
} // namespace |
} // namespace cc |