Remove ImmersiveModeController::MaybeStartReveal() / ImmersiveModeController::CancelReveal()

chrome/browser/ui/views/frame/immersive_mode_controller_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/immersive_mode_controller_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
@@ skipping 104 matching lines @@
   EXPECT_FALSE(browser_view->tabstrip()->IsImmersiveStyle());
   EXPECT_TRUE(browser_view->IsTabStripVisible());
   EXPECT_TRUE(browser_view->IsToolbarVisible());
   // Shelf hide triggered by enabling immersive mode eventually changes the
   // widget bounds and causes a Layout(). Force it to happen early for test.
   browser_view->parent()->Layout();
   // Content area is still immediately below the tab indicators.
   EXPECT_EQ(GetRectInWidget(browser_view).y() + Tab::GetImmersiveHeight(),
             GetRectInWidget(contents_view).y());
 
-  // Ending a reveal keeps us in immersive mode, but toolbar goes invisible.
-  controller->CancelReveal();
+  // End reveal by moving the mouse off the top-of-window views. We
+  // should stay in immersive mode, but the toolbar should go invisible.
+  controller->SetMouseHoveredForTest(false);
   EXPECT_TRUE(controller->IsEnabled());
   EXPECT_TRUE(controller->ShouldHideTopViews());
   EXPECT_FALSE(controller->IsRevealed());
   EXPECT_TRUE(browser_view->tabstrip()->IsImmersiveStyle());
   EXPECT_TRUE(browser_view->IsTabStripVisible());
   EXPECT_FALSE(browser_view->IsToolbarVisible());
 
   // Disabling immersive mode puts us back to the beginning.
   chrome::ToggleFullscreenMode(browser());
   ASSERT_FALSE(browser_view->IsFullscreen());
@@ skipping 245 matching lines @@
 
   // Immersive mode should start in the closed state because the lock is no
   // longer held.
   chrome::ToggleFullscreenMode(browser());
   EXPECT_TRUE(controller->IsEnabled());
   EXPECT_FALSE(controller->IsRevealed());
   EXPECT_TRUE(controller->ShouldHideTopViews());
 
   // 2) Test that acquiring a revealed state lock reveals the top-of-window
   // views if they are hidden.
-  controller->CancelReveal();
   EXPECT_FALSE(controller->IsRevealed());
   lock1.reset(controller->GetRevealedLock());
   EXPECT_TRUE(controller->IsRevealed());
 
   // 3) Test that the top-of-window views are only hidden when all of the locks
   // are released.
   lock2.reset(controller->GetRevealedLock());
   lock1.reset();
   EXPECT_TRUE(controller->IsRevealed());
 
@@ skipping 47 matching lines @@
 
   // Setting the window property directly toggles immersive mode.
   aura::Window* window = browser_view->GetWidget()->GetNativeWindow();
   window->SetProperty(ash::internal::kImmersiveModeKey, true);
   EXPECT_TRUE(immersive_controller->IsEnabled());
   window->SetProperty(ash::internal::kImmersiveModeKey, false);
   EXPECT_FALSE(immersive_controller->IsEnabled());
 }
 
 #endif  // defined(OS_CHROMEOS)