[Mac] Fullscreen Toolbar Bar Visibility Edge Cases

chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index b0d72adabba6577caff84031a8240343f94e0aa8..39339b3a393879dd7ece67a374c06f895547f419 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -212,9 +212,9 @@ class ViewExposedChecker {
 @synthesize isRevealingToolbarForTabstrip = isRevealingToolbarForTabstrip_;
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller {
-  if ((self = [super
-           initWithBrowserController:controller
-                               style:fullscreen_mac::OMNIBOX_TABS_HIDDEN])) {
+  if ((self = [super initWithBrowserController:controller
+                                         style:FullscreenSlidingStyle::
+                                                   OMNIBOX_TABS_HIDDEN])) {
   }
 
   return self;
@@ -371,12 +371,12 @@ class BrowserWindowControllerTest : public InProcessBrowserTest {
     runner->Run();
   }
 
-  void VerifyFullscreenToolbarVisibility(fullscreen_mac::SlidingStyle style) {
+  void VerifyFullscreenToolbarVisibility(FullscreenSlidingStyle style) {
     EXPECT_EQ([[controller() fullscreenToolbarController] slidingStyle], style);
 
     NSRect toolbarFrame = [[[controller() toolbarController] view] frame];
     NSRect screenFrame = [[[controller() window] screen] frame];
-    if (style == fullscreen_mac::OMNIBOX_TABS_PRESENT)
+    if (style == FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT)
       EXPECT_LE(NSMaxY(toolbarFrame), NSMaxY(screenFrame));
     else
       EXPECT_GE(NSMinY(toolbarFrame), NSMaxY(screenFrame));
@@ -757,21 +757,24 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
 
   // Toggle fullscreen and check if the toolbar is shown.
   ToggleFullscreenAndWaitForNotification();
-  VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_PRESENT);
+  VerifyFullscreenToolbarVisibility(
+      FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT);
 
   // Toggle the visibility of the fullscreen toolbar. Verify that the toolbar
   // is hidden and the preference is correctly updated.
   [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_FALSE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
-  VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN);
+  VerifyFullscreenToolbarVisibility(
+      FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN);
 
   // Toggle out and back into fullscreen and verify that the toolbar is still
   // hidden.
   ToggleFullscreenAndWaitForNotification();
   ToggleFullscreenAndWaitForNotification();
   [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
-  VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN);
+  VerifyFullscreenToolbarVisibility(
+      FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN);
 
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));