(Reland) Always create top controls manager

cc/input/top_controls_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/top_controls_manager.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 396 matching lines @@
 
   client.SetTopControlsHeight(50.f);
   EXPECT_FALSE(manager->animation());
   EXPECT_FLOAT_EQ(50.f, manager->TopControlsHeight());
   EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
 }
 
 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(0.f, manager->ControlsTopOffset());
+  EXPECT_EQ(-1.f, manager->ControlsTopOffset());
   EXPECT_EQ(0.f, manager->ContentTopOffset());
 
   client.SetTopControlsHeight(50.f);
   EXPECT_FALSE(manager->animation());
   EXPECT_EQ(-50.f, manager->ControlsTopOffset());
   EXPECT_EQ(0.f, manager->ContentTopOffset());
 
   client.SetTopControlsHeight(100.f);
   EXPECT_FALSE(manager->animation());
   EXPECT_EQ(-100.f, manager->ControlsTopOffset());
@@ skipping 31 matching lines @@
   EXPECT_FLOAT_EQ(20.f, pending.y());
   EXPECT_FLOAT_EQ(0.f, manager->ControlsTopOffset());
   EXPECT_FLOAT_EQ(0.f, manager->ContentTopOffset());
   EXPECT_FLOAT_EQ(1.f, client.CurrentTopControlsShownRatio());
   manager->ScrollEnd();
 }
 
 
 }  // namespace
 }  // namespace cc