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

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.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_non_client_frame_view_ash.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/header_painter.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
+#include "ash/test/immersive_fullscreen_controller_test_api.h"
 #include "base/command_line.h"
 #include "build/build_config.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
+#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
+#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/test/immersive_fullscreen_controller_test_api.h"
-#include "chrome/browser/profiles/profile_avatar_icon_util.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"
-#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
-#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
-#include "components/signin/core/account_id/account_id.h"
-#endif  // defined(OS_CHROMEOS)
-
 using views::Widget;
 
 typedef InProcessBrowserTest BrowserNonClientFrameViewAshTest;
 
 IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, NonClientHitTest) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   Widget* widget = browser_view->GetWidget();
   // We know we're using Ash, so static cast.
   BrowserNonClientFrameViewAsh* frame_view =
       static_cast<BrowserNonClientFrameViewAsh*>(
@@ skipping 54 matching lines @@
   {
     std::unique_ptr<FullscreenNotificationObserver> waiter(
         new FullscreenNotificationObserver());
     chrome::ToggleFullscreenMode(browser());
     waiter->Wait();
   }
   EXPECT_TRUE(frame_view->ShouldPaint());
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
 }
 
-#if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   content::WebContents* web_contents = browser_view->GetActiveWebContents();
   Widget* widget = browser_view->GetWidget();
   // We know we're using Ash, so static cast.
   BrowserNonClientFrameViewAsh* frame_view =
       static_cast<BrowserNonClientFrameViewAsh*>(
           widget->non_client_view()->frame_view());
 
   ImmersiveModeController* immersive_mode_controller =
       browser_view->immersive_mode_controller();
   ASSERT_EQ(ImmersiveModeController::Type::ASH,
             immersive_mode_controller->type());
 
   ash::ImmersiveFullscreenControllerTestApi(
       static_cast<ImmersiveModeControllerAsh*>(immersive_mode_controller)
           ->controller())
       .SetupForTest();
 
   // Immersive fullscreen starts disabled.
   ASSERT_FALSE(widget->IsFullscreen());
   EXPECT_FALSE(immersive_mode_controller->IsEnabled());
 
   // Frame paints by default.
   EXPECT_TRUE(frame_view->ShouldPaint());
-  EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->GetHeaderHeightForPainting());
+  EXPECT_LT(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Enter both browser fullscreen and tab fullscreen. Entering browser
   // fullscreen should enable immersive fullscreen.
   {
     // NOTIFICATION_FULLSCREEN_CHANGED is sent asynchronously.
     std::unique_ptr<FullscreenNotificationObserver> waiter(
         new FullscreenNotificationObserver());
     chrome::ToggleFullscreenMode(browser());
     waiter->Wait();
   }
   {
     std::unique_ptr<FullscreenNotificationObserver> waiter(
         new FullscreenNotificationObserver());
     browser()
         ->exclusive_access_manager()
         ->fullscreen_controller()
         ->EnterFullscreenModeForTab(web_contents, GURL());
     waiter->Wait();
   }
   EXPECT_TRUE(immersive_mode_controller->IsEnabled());
 
   // An immersive reveal shows the buttons and the top of the frame.
   std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
       immersive_mode_controller->GetRevealedLock(
           ImmersiveModeController::ANIMATE_REVEAL_NO));
   EXPECT_TRUE(immersive_mode_controller->IsRevealed());
   EXPECT_TRUE(frame_view->ShouldPaint());
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
-  EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
 
   // End the reveal. When in both immersive browser fullscreen and tab
-  // fullscreen, the tab lightbars should not be painted.
+  // fullscreen.
   revealed_lock.reset();
   EXPECT_FALSE(immersive_mode_controller->IsRevealed());
   EXPECT_FALSE(frame_view->ShouldPaint());
   EXPECT_EQ(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 
-  // Repeat test but without tab fullscreen. The tab lightbars should now show
-  // when the top-of-window views are not revealed.
+  // Repeat test but without tab fullscreen.
   {
     std::unique_ptr<FullscreenNotificationObserver> waiter(
         new FullscreenNotificationObserver());
     browser()
         ->exclusive_access_manager()
         ->fullscreen_controller()
         ->ExitFullscreenModeForTab(web_contents);
     waiter->Wait();
   }
 
   // Immersive reveal should have same behavior as before.
   revealed_lock.reset(immersive_mode_controller->GetRevealedLock(
       ImmersiveModeController::ANIMATE_REVEAL_NO));
   EXPECT_TRUE(immersive_mode_controller->IsRevealed());
   EXPECT_TRUE(frame_view->ShouldPaint());
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
-  EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
-  EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->GetHeaderHeightForPainting());
+  EXPECT_LT(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Ending the reveal. Immersive browser should have the same behavior as full
-  // screen, i.e., no light bar and having an origin of (0,0).
+  // screen, i.e., having an origin of (0,0).
   revealed_lock.reset();
   EXPECT_FALSE(frame_view->ShouldPaint());
-  EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
   EXPECT_EQ(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Exiting immersive fullscreen should make the caption buttons and the frame
   // visible again.
   {
     std::unique_ptr<FullscreenNotificationObserver> waiter(
         new FullscreenNotificationObserver());
     browser_view->ExitFullscreen();
     waiter->Wait();
   }
   EXPECT_FALSE(immersive_mode_controller->IsEnabled());
   EXPECT_TRUE(frame_view->ShouldPaint());
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
-  EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
-  EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->GetHeaderHeightForPainting());
+  EXPECT_LT(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 }
 
 // Tests that Avatar icon should show on the top left corner of the teleported
 // browser window on ChromeOS.
 IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
                        AvatarDisplayOnTeleportedWindow) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   Widget* widget = browser_view->GetWidget();
   // We know we're using Ash, so static cast.
   BrowserNonClientFrameViewAsh* frame_view =
@@ skipping 39 matching lines @@
 
   // Teleport the window to another desktop.
   const AccountId account_id2(AccountId::FromUserEmail("user2"));
   manager->ShowWindowForUser(browser()->window()->GetNativeWindow(),
                              account_id2);
   // Clicking on the avatar icon should have same behaviour like clicking on
   // the caption area, i.e., allow the user to drag the browser window around.
   EXPECT_EQ(HTCAPTION, frame_view->NonClientHitTest(avatar_center));
 }
 
-#endif  // defined(OS_CHROMEOS)
-
 // Tests that FrameCaptionButtonContainer has been relaid out in response to
 // maximize mode being toggled.
 IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
                        ToggleMaximizeModeRelayout) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   Widget* widget = browser_view->GetWidget();
   // We know we're using Ash, so static cast.
   BrowserNonClientFrameViewAsh* frame_view =
       static_cast<BrowserNonClientFrameViewAsh*>(
           widget->non_client_view()->frame_view());
 
   const gfx::Rect initial = frame_view->caption_button_container_->bounds();
   ash::WmShell::Get()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   ash::FrameCaptionButtonContainerView::TestApi test(frame_view->
                                                      caption_button_container_);
   test.EndAnimations();
   const gfx::Rect during_maximize = frame_view->caption_button_container_->
       bounds();
   EXPECT_GT(initial.width(), during_maximize.width());
   ash::WmShell::Get()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(false);
   test.EndAnimations();
   const gfx::Rect after_restore = frame_view->caption_button_container_->
       bounds();
   EXPECT_EQ(initial, after_restore);
 }