Controls offsets computed if either top or bottom are showing

cc/input/browser_controls_offset_manager_unittest.cc

Index: cc/input/browser_controls_offset_manager_unittest.cc
diff --git a/cc/input/browser_controls_offset_manager_unittest.cc b/cc/input/browser_controls_offset_manager_unittest.cc
index 1fc7498068c7fa2d5003926cebf4587f56e4dc1d..4e7ed8b18e0a186affd840007ad052567ec56525 100644
--- a/cc/input/browser_controls_offset_manager_unittest.cc
+++ b/cc/input/browser_controls_offset_manager_unittest.cc
@@ -502,7 +502,24 @@ TEST(BrowserControlsOffsetManagerTest, ScrollThenRestoreBottomControls) {
 }
 
 TEST(BrowserControlsOffsetManagerTest,
-     ScrollThenRestoreBottomControlsNoBrowserControls) {
+     ScrollThenRestoreBottomControlsNoTopControls) {
+  MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
+  client.SetBottomControlsHeight(100.f);
+  BrowserControlsOffsetManager* manager = client.manager();
+  manager->ScrollBegin();
+  manager->ScrollBy(gfx::Vector2dF(0.f, 20.f));
+  EXPECT_FLOAT_EQ(80.f, manager->ContentBottomOffset());
+  EXPECT_FLOAT_EQ(0.8f, manager->BottomControlsShownRatio());
+  manager->ScrollEnd();
+
+  manager->ScrollBegin();
+  manager->ScrollBy(gfx::Vector2dF(0.f, -200.f));
+  EXPECT_FLOAT_EQ(100.f, manager->ContentBottomOffset());
+  EXPECT_FLOAT_EQ(1.f, manager->BottomControlsShownRatio());
+  manager->ScrollEnd();
+}
+
+TEST(BrowserControlsManagerTest, ScrollThenRestoreBottomControlsNoTopControls) {

[Ted C, 2016/10/31 20:17:38]

Unless my eyes fail me, this has the same test name as the one above.  does that
work?

[mdjones, 2016/10/31 21:11:41]

Oh boy... bad rebase. Looks like some of this code slipped in with the rename
patch... The suite name is different which is why this still compiled. Removed
duplicate.

   MockBrowserControlsOffsetManagerClient client(0.f, 0.5f, 0.5f);
   client.SetBottomControlsHeight(100.f);
   BrowserControlsOffsetManager* manager = client.manager();