| Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| index 351229a16b19775b163512740d497b70877ed89d..778e5e8f43a900b6d0c2653d53fbaafb6a9bfade 100644
|
| --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| @@ -7,7 +7,6 @@
|
| #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/material_design/material_design_controller.h"
|
| #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/shell.h"
|
| @@ -196,21 +195,12 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
|
| EXPECT_LT(Tab::GetImmersiveHeight(),
|
| frame_view->header_painter_->GetHeaderHeightForPainting());
|
|
|
| - // Ending the reveal. In MD, immersive browser should have the same behavior
|
| - // as full screen, i.e., no light bar and having an origin of (0,0). In
|
| - // non-MD, immersive browser will show a 3 dp light bar on the top.
|
| + // 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).
|
| revealed_lock.reset();
|
| - if (ash::MaterialDesignController::IsImmersiveModeMaterial()) {
|
| - EXPECT_FALSE(frame_view->ShouldPaint());
|
| - EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
|
| - EXPECT_EQ(0, frame_view->header_painter_->GetHeaderHeightForPainting());
|
| - } else {
|
| - EXPECT_TRUE(frame_view->ShouldPaint());
|
| - EXPECT_FALSE(frame_view->caption_button_container_->visible());
|
| - EXPECT_TRUE(frame_view->UseImmersiveLightbarHeaderStyle());
|
| - EXPECT_EQ(Tab::GetImmersiveHeight(),
|
| - frame_view->header_painter_->GetHeaderHeightForPainting());
|
| - }
|
| + 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.
|
|
|