(Reland) Always create top controls manager

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 257 matching lines @@
 
   settings.can_use_lcd_text = compositor_deps_->IsLcdTextEnabled();
   settings.use_distance_field_text =
       compositor_deps_->IsDistanceFieldTextEnabled();
   settings.use_zero_copy = compositor_deps_->IsZeroCopyEnabled();
   settings.use_one_copy = compositor_deps_->IsOneCopyEnabled();
   settings.enable_elastic_overscroll =
       compositor_deps_->IsElasticOverscrollEnabled();
   settings.use_image_texture_target = compositor_deps_->GetImageTextureTarget();
 
-  settings.calculate_top_controls_position =
-      cmd->HasSwitch(cc::switches::kEnableTopControlsPositionCalculation);
   if (cmd->HasSwitch(cc::switches::kTopControlsShowThreshold)) {
       std::string top_threshold_str =
           cmd->GetSwitchValueASCII(cc::switches::kTopControlsShowThreshold);
       double show_threshold;
       if (base::StringToDouble(top_threshold_str, &show_threshold) &&
           show_threshold >= 0.f && show_threshold <= 1.f)
         settings.top_controls_show_threshold = show_threshold;
   }
 
   if (cmd->HasSwitch(cc::switches::kTopControlsHideThreshold)) {
@@ skipping 621 matching lines @@
   cc::ContextProvider* provider =
       compositor_deps_->GetSharedMainThreadContextProvider();
   // provider can be NULL after the GPU process crashed enough times and we
   // don't want to restart it any more (falling back to software).
   if (!provider)
     return;
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content