[Mac] Move the fullscreen toolbar style to FullscreenToolbarController

chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <stddef.h>
 #import "base/mac/mac_util.h"
 
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 174 matching lines @@
 
 }  // namespace
 
 // Mock FullscreenToolbarController used to test if the toolbar reveal animation
 // is called correctly.
 @interface MockFullscreenToolbarController : FullscreenToolbarController
 
 // True if revealToolbarForTabStripChanges was called.
 @property(nonatomic, assign) BOOL isRevealingToolbarForTabstrip;
 
-// Initializer.
-- (id)initWithBrowserController:(BrowserWindowController*)controller;
-
 // Sets isRevealingToolbarForTabstrip back to false.
 - (void)resetToolbarFlag;
 
 // Overridden to set isRevealingToolbarForTabstrip to true when it's called.
 - (void)revealToolbarForTabStripChanges;
 
-// Overridden so that we don't have to deal with the DCHECKs when the
-// BWC exits fullscreen.
-- (void)exitFullscreenMode;
-
 @end
 
 @implementation MockFullscreenToolbarController
 
 @synthesize isRevealingToolbarForTabstrip = isRevealingToolbarForTabstrip_;
 
-- (id)initWithBrowserController:(BrowserWindowController*)controller {
-  if ((self = [super initWithBrowserController:controller
-                                         style:FullscreenSlidingStyle::
-                                                   OMNIBOX_TABS_HIDDEN])) {
-  }
-
-  return self;
-}
-
 - (void)resetToolbarFlag {
   isRevealingToolbarForTabstrip_ = NO;
 }
 
 - (void)revealToolbarForTabStripChanges {
   isRevealingToolbarForTabstrip_ = YES;
 }
 
-- (void)exitFullscreenMode {
-}
-
 @end
 
 @interface InfoBarContainerController(TestingAPI)
 - (BOOL)isTopInfoBarAnimationRunning;
 @end
 
 @implementation InfoBarContainerController(TestingAPI)
 - (BOOL)isTopInfoBarAnimationRunning {
   InfoBarController* infoBarController = [infobarControllers_ objectAtIndex:0];
   if (infoBarController) {
@@ skipping 120 matching lines @@
     base::Timer timer(false, true);
     timer.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckBookmarkBarAnimation,
                    [controller() bookmarkBarController],
                    runner->QuitClosure()));
     runner->Run();
   }
 
-  void VerifyFullscreenToolbarVisibility(FullscreenSlidingStyle style) {
-    EXPECT_EQ([[controller() fullscreenToolbarController] slidingStyle], style);
+  void VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle style) {
+    EXPECT_EQ([[controller() fullscreenToolbarController] toolbarStyle], style);
 
     NSRect toolbarFrame = [[[controller() toolbarController] view] frame];
     NSRect screenFrame = [[[controller() window] screen] frame];
-    if (style == FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT)
+    if (style == FullscreenToolbarStyle::TOOLBAR_PRESENT)
       EXPECT_LE(NSMaxY(toolbarFrame), NSMaxY(screenFrame));
     else
       EXPECT_GE(NSMinY(toolbarFrame), NSMaxY(screenFrame));
   }
 
   NSInteger GetExpectedTopInfoBarTipHeight() {
     InfoBarContainerController* info_bar_container_controller =
         [controller() infoBarContainerController];
     CGFloat overlapping_tip_height =
         [info_bar_container_controller overlappingTipHeight];
@@ skipping 360 matching lines @@
 // preferences are updated correctly.
 // Flakily times out. http://crbug.com/599119
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        DISABLED_FullscreenToolbarIsVisibleAccordingToPrefs) {
   // Tests that the preference is set to true by default.
   PrefService* prefs = browser()->profile()->GetPrefs();
   EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
 
   // Toggle fullscreen and check if the toolbar is shown.
   ToggleFullscreenAndWaitForNotification();
-  VerifyFullscreenToolbarVisibility(
-      FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT);
+  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_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(
-      FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN);
+  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_HIDDEN);
 
   // Toggle out and back into fullscreen and verify that the toolbar is still
   // hidden.
   ToggleFullscreenAndWaitForNotification();
   ToggleFullscreenAndWaitForNotification();
   [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
-  VerifyFullscreenToolbarVisibility(
-      FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN);
+  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_HIDDEN);
 
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
 }
 
 // Tests that the toolbar (tabstrip and omnibox) reveal animation is correctly
 // triggered by the changes in the tabstrip. The animation should not trigger
 // if the current tab is a NTP, since the location bar would be focused.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        FullscreenToolbarExposedForTabstripChanges) {
@@ skipping 29 matching lines @@
   EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 
   // Switch to a non-NTP tab.
   TabStripModel* model = browser()->tab_strip_model();
   model->ActivateTabAt(1, true);
   ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]);
   EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 }