[Mac] Refactor the fullscreen toolbar animation

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 3f9f5a88871ab750d2c746cd009394b49cfe2330..546fa63014235a7662543906b402b3046cb6b926 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1950,9 +1950,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
 
     // If enabled, show the overlay if necessary (and if the fullscreen
     // toolbar is hidden).
-    if (barVisibilityUpdatesEnabled_) {
-      [fullscreenToolbarController_ lockBarVisibilityWithAnimation:animate];
-    }
+    if (barVisibilityUpdatesEnabled_)
+      [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate];
   }
 }
 
@@ -1962,10 +1961,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
 
     // If enabled, hide the overlay if necessary (and if the fullscreen
     // toolbar is hidden).
-    if (barVisibilityUpdatesEnabled_ &&
-        ![barVisibilityLocks_ count]) {
-      [fullscreenToolbarController_ releaseBarVisibilityWithAnimation:animate];
-    }
+    if (barVisibilityUpdatesEnabled_ && ![barVisibilityLocks_ count])
+      [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate];
   }
 }