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

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

Index: chrome/browser/ui/views/frame/browser_view_layout.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 11214a86ecf0cc95c204eea760a98d20fcf6504d..5f0369f299e88bcf40a0da3a5ae473f414a4cdf3 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -449,12 +449,10 @@ int BrowserViewLayout::LayoutBookmarkBar(int top) {
 
 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(),