[Merge to M57] cros-md: Remove the non-MD immersive mode code paths

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 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 "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 431 matching lines @@
                            vertical_layout_rect_.width(),
                            bookmark_bar_height);
   // Set visibility after setting bounds, as the visibility update uses the
   // bounds to determine if the mouse is hovering over a button.
   bookmark_bar_->SetVisible(true);
   return y + bookmark_bar_height;
 }
 
 int BrowserViewLayout::LayoutInfoBar(int top) {
   // In immersive fullscreen, the infobar always starts near the top of the
-  // screen, just under the "light bar" rectangular stripes.
-  if (immersive_mode_controller_->IsEnabled()) {
+  // screen.
+  if (immersive_mode_controller_->IsEnabled())
     top = browser_view_->y();
-    if (!immersive_mode_controller_->ShouldHideTabIndicators())
-      top += TabStrip::GetImmersiveHeight();
-  }
+
   infobar_container_->SetVisible(InfobarVisible());
   infobar_container_->SetBounds(
       vertical_layout_rect_.x(), top, vertical_layout_rect_.width(),
       infobar_container_->GetPreferredSize().height());
   return top + infobar_container_->height();
 }
 
 void BrowserViewLayout::LayoutContentsContainerView(int top, int bottom) {
   // |contents_container_| contains web page contents and devtools.
   // See browser_view.h for details.
@@ skipping 66 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }