Controls offsets computed if either top or bottom are showing

cc/input/browser_controls_offset_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/input/browser_controls_offset_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 484 matching lines @@
   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(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();
   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());
@@ skipping 28 matching lines @@
   EXPECT_TRUE(manager->has_animation());
   EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio());
 
   manager->UpdateBrowserControlsState(BOTH, SHOWN, true);
   EXPECT_FALSE(manager->has_animation());
   EXPECT_FLOAT_EQ(1.f, client.CurrentBrowserControlsShownRatio());
 }
 
 }  // namespace
 }  // namespace cc