Do not show shelf or top chrome hints while in Ash immersive mode

ash/shelf/shelf_layout_manager_unittest.cc

 // Copyright (c) 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 "ash/common/shelf/shelf_layout_manager.h"
 
 #include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_table.h"
@@ skipping 164 matching lines @@
 
     // if the shelf is being dimmed test dimmer bounds as well.
     if (GetShelfWidget()->GetDimsShelf())
       EXPECT_EQ(GetShelfWidget()->GetWindowBoundsInScreen(),
                 GetShelfWidget()->GetDimmerBoundsForTest());
 
     // Auto hidden shelf has a visible height of 0 in MD (where this inequality
     // does not apply); whereas auto hidden shelf has a visible height of 3 in
     // non-MD.
     WmShelf* shelf = test::AshTestBase::GetPrimaryShelf();
-    if (!ash::MaterialDesignController::IsShelfMaterial() ||
+    if (!ash::MaterialDesignController::IsImmersiveModeMaterial() ||
         shelf->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
       EXPECT_GE(shelf_bounds.height(),
                 auto_hidden_shelf_widget_bounds_.height());
     }
 
     float scroll_delta =
         GetShelfLayoutManager()->PrimaryAxisValue(scroll_.y(), scroll_.x());
     bool increasing_drag =
         GetShelfLayoutManager()->SelectValueForShelfAlignment(
             scroll_delta<0, scroll_delta> 0, scroll_delta < 0);
@@ skipping 328 matching lines @@
   widget->SetFullscreen(true);
   wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
       ash::wm::WindowState::SHELF_AUTO_HIDE_VISIBLE);
   layout_manager->UpdateVisibilityState();
 
   gfx::Rect bounds_fullscreen = window->bounds();
   EXPECT_TRUE(widget->IsFullscreen());
 
   // Shelf hints are removed in immersive full screen mode in MD; and some shelf
   // hints are shown in non-MD mode.
-  if (ash::MaterialDesignController::IsShelfMaterial())
+  if (ash::MaterialDesignController::IsImmersiveModeMaterial())
     EXPECT_EQ(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
   else
     EXPECT_NE(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
 
   // Swipe up. This should show the shelf.
   end = below_start - delta;
   generator.GestureScrollSequenceWithCallback(
       below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
@@ skipping 19 matching lines @@
   // Set the shelf to be auto hide and invisible when |widget| is fullscreen.
   // (used in arc immersive fullscreen)
   wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
       ash::wm::WindowState::SHELF_AUTO_HIDE_INVISIBLE);
   layout_manager->UpdateVisibilityState();
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_TRUE(widget->IsFullscreen());
   EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().bounds(),
             display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 
-  // Switch from invisible to visible autodhide.
+  // Switch from invisible to visible autohide.
   wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
       ash::wm::WindowState::SHELF_AUTO_HIDE_VISIBLE);
   layout_manager->UpdateVisibilityState();
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_TRUE(widget->IsFullscreen());
-  EXPECT_NE(display::Screen::GetScreen()->GetPrimaryDisplay().bounds(),
-            display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 
-  // Switch from invisible to visible autodhide.
+  // Auto hidden shelf has a visible height of 0 in MD (where this inequality
+  // does not apply); whereas auto hidden shelf has a visible height of 3 in
+  // non-MD.
+  if (ash::MaterialDesignController::IsImmersiveModeMaterial()) {
+    EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().bounds(),
+              display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
+  } else {
+    EXPECT_NE(display::Screen::GetScreen()->GetPrimaryDisplay().bounds(),
+              display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
+  }
+
+  // Switch from visible to invisible autohide.
   wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
       ash::wm::WindowState::SHELF_AUTO_HIDE_INVISIBLE);
   layout_manager->UpdateVisibilityState();
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_TRUE(widget->IsFullscreen());
   EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().bounds(),
             display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 
   // Set the shelf to be hidden when |widget| is fullscreen. (eg tab fullscreen
   // with or without immersive browser fullscreen).
@@ skipping 1481 matching lines @@
   // Open keyboard in sticky mode.
   kb_controller->ShowKeyboard(true);
   layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());
 
   // Work area should be changed.
   EXPECT_NE(orig_work_area,
             display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
 }
 
 }  // namespace ash