Revert auto-hide-invisible mode for ARC++

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 504 matching lines @@
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(GetShelfWidget()->GetDimmerBoundsForTest(), gfx::Rect());
   EXPECT_EQ(bounds_noshelf.ToString(), window->bounds().ToString());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Put |widget| into fullscreen. Set the shelf to be auto hidden when |widget|
   // is fullscreen. (eg browser immersive fullscreen).
   widget->SetFullscreen(true);
-  wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
-      ash::wm::WindowState::SHELF_AUTO_HIDE_VISIBLE);
+  wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(false);
   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::IsImmersiveModeMaterial())
     EXPECT_EQ(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
   else
@@ skipping 17 matching lines @@
       below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 
-  // 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 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());
-
-  // 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).
-  wm::GetWindowState(window)->set_shelf_mode_in_fullscreen(
-      ash::wm::WindowState::SHELF_HIDDEN);
+  wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(true);
 
   layout_manager->UpdateVisibilityState();
   EXPECT_EQ(SHELF_HIDDEN, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
 
   // Swipe-up. This should not change anything.
   end = start - delta;
   generator.GestureScrollSequenceWithCallback(
       below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
@@ skipping 1469 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