cros-md: Remove the non-MD immersive mode code paths

chrome/browser/ui/views/frame/immersive_mode_controller_ash_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 "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 114 matching lines @@
   EXPECT_TRUE(tabstrip->visible());
   EXPECT_TRUE(toolbar->visible());
 
   ToggleFullscreen();
   EXPECT_TRUE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
   EXPECT_FALSE(toolbar->visible());
   // The browser's top chrome is completely offscreen with tapstrip visible.
   EXPECT_TRUE(tabstrip->visible());
-
-  // The tab indicators should be flush with the top of the widget.
-  EXPECT_EQ(0, GetBoundsInWidget(tabstrip).y());
+  // Tabstrip and top container view should be completely offscreen.
+  EXPECT_EQ(0, GetBoundsInWidget(tabstrip).bottom());
+  EXPECT_EQ(0, GetBoundsInWidget(browser_view()->top_container()).bottom());
 
   // Since the tab strip and tool bar are both hidden in immersive fullscreen
   // mode, the web contents should extend to the edge of screen.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Revealing the top-of-window views should set the tab strip back to the
   // normal style and show the toolbar.
   AttemptReveal();
   EXPECT_TRUE(controller()->IsRevealed());
   EXPECT_TRUE(tabstrip->visible());
-  EXPECT_FALSE(tabstrip->IsImmersiveStyle());
   EXPECT_TRUE(toolbar->visible());
 
   // The TopContainerView should be flush with the top edge of the widget. If
   // it is not flush with the top edge the immersive reveal animation looks
   // wonky.
   EXPECT_EQ(0, GetBoundsInWidget(browser_view()->top_container()).y());
 
   // The web contents should be at the same y position as they were when the
   // top-of-window views were hidden.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Repeat the test for when in both immersive fullscreen and tab fullscreen.
   SetTabFullscreen(true);
   // Hide and reveal the top-of-window views so that they get relain out.
   AttemptUnreveal();
   AttemptReveal();
 
   // The tab strip and toolbar should still be visible and the TopContainerView
   // should still be flush with the top edge of the widget.
   EXPECT_TRUE(controller()->IsRevealed());
   EXPECT_TRUE(tabstrip->visible());
-  EXPECT_FALSE(tabstrip->IsImmersiveStyle());
   EXPECT_TRUE(toolbar->visible());
   EXPECT_EQ(0, GetBoundsInWidget(browser_view()->top_container()).y());
 
   // The web contents should be flush with the top edge of the widget when in
   // both immersive and tab fullscreen.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Hide the top-of-window views. Tabstrip is still considered as visible.
   AttemptUnreveal();
   EXPECT_FALSE(controller()->IsRevealed());
   EXPECT_FALSE(toolbar->visible());
   EXPECT_TRUE(tabstrip->visible());
 
   // The web contents should still be flush with the edge of the widget.
   EXPECT_EQ(0, GetBoundsInWidget(contents_web_view).y());
 
   // Exiting both immersive and tab fullscreen should show the tab strip and
   // toolbar.
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
   EXPECT_TRUE(tabstrip->visible());
-  EXPECT_FALSE(tabstrip->IsImmersiveStyle());
   EXPECT_TRUE(toolbar->visible());
 }
 
 // Test that the browser commands which are usually disabled in fullscreen are
 // are enabled in immersive fullscreen.
 TEST_F(ImmersiveModeControllerAshTest, EnabledCommands) {
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION));
@@ skipping 11 matching lines @@
   ToggleFullscreen();
   AttemptReveal();
   ASSERT_TRUE(controller()->IsEnabled());
   ASSERT_TRUE(controller()->IsRevealed());
   ASSERT_TRUE(browser_view()->GetWidget()->IsFullscreen());
 
   browser_view()->GetWidget()->Restore();
   EXPECT_FALSE(controller()->IsEnabled());
 }
 
-// Test how being simultaneously in tab fullscreen and immersive fullscreen
-// affects the shelf visibility and whether the tab indicators are hidden.
+// Test the shelf visibility affected by entering and exiting tab fullscreen and
+// immersive fullscreen.
 TEST_F(ImmersiveModeControllerAshTest, TabAndBrowserFullscreen) {
   AddTab(browser(), GURL("about:blank"));
 
   // The shelf should start out as visible.
   ash::ShelfLayoutManager* shelf =
       ash::Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   ASSERT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
 
-  // 1) Test that entering tab fullscreen from immersive fullscreen hides the
-  // tab indicators and the shelf.
-  // Note that tab indicators are removed from MD, so ShouldHideTabIndicators()
-  // always returns true.
+  // 1) Test that entering tab fullscreen from immersive fullscreen hides
+  // the shelf.
   ToggleFullscreen();
   ASSERT_TRUE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   SetTabFullscreen(true);
   ASSERT_TRUE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_HIDDEN, shelf->visibility_state());
 
-  // 2) Test that exiting tab fullscreen shows the tab indicators and autohides
-  // the shelf.
+  // 2) Test that exiting tab fullscreen autohides the shelf.
   SetTabFullscreen(false);
   ASSERT_TRUE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
-  // 3) Test that exiting tab fullscreen and immersive fullscreen simultaneously
-  // correctly updates the shelf visibility and whether the tab indicators
-  // should be hidden.
+  // 3) Test that exiting tab fullscreen and immersive fullscreen correctly
+  // updates the shelf visibility.
   SetTabFullscreen(true);
   ToggleFullscreen();
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
 }
 
 // Ensure the circular tab-loading throbbers are not painted as layers in
 // immersive fullscreen, since the tab strip may animate in or out without
 // moving the layers.
 TEST_F(ImmersiveModeControllerAshTest, LayeredSpinners) {
@@ skipping 80 matching lines @@
 
   // Exit immersive fullscreen. The web contents should be back below the window
   // header.
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
   EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
 }