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..ef049002be5b4585103a62ae571b30c0340476db 100644
--- a/cc/input/browser_controls_offset_manager_unittest.cc
+++ b/cc/input/browser_controls_offset_manager_unittest.cc
@@ -502,7 +502,7 @@ TEST(BrowserControlsOffsetManagerTest, ScrollThenRestoreBottomControls) {
 }
 
 TEST(BrowserControlsOffsetManagerTest,

[aelias_OOO_until_Jul13, 2016/11/01 21:15:46]

Could you add a new CC test covering the bug you're fixing in this patch?

-     ScrollThenRestoreBottomControlsNoBrowserControls) {
+     ScrollThenRestoreBottomControlsNoTopControls) {

[aelias_OOO_until_Jul13, 2016/11/01 21:15:46]

Another rebase issue.

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