[Mac] Refactor Cocoa fullscreen code

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 15 matching lines @@
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
-#import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
+#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
@@ skipping 131 matching lines @@
 
   // Exceptions are allowed to overlap |exposed_view_|. Exceptions must still
   // be Z-order behind |exposed_view_|.
   base::scoped_nsobject<NSArray> exceptions_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewExposedChecker);
 };
 
 }  // namespace
 
-// Mock PresentationModeController used to test if the toolbar reveal animation
+// Mock FullscreenToolbarController used to test if the toolbar reveal animation
 // is called correctly.
-@interface MockPresentationModeController : PresentationModeController
+@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)exitPresentationMode;
+- (void)exitFullscreenMode;
 
 @end
 
-@implementation MockPresentationModeController
+@implementation MockFullscreenToolbarController
 
 @synthesize isRevealingToolbarForTabstrip = isRevealingToolbarForTabstrip_;
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller {
   if ((self = [super
            initWithBrowserController:controller
                                style:fullscreen_mac::OMNIBOX_TABS_HIDDEN])) {
   }
 
   return self;
 }
 
 - (void)resetToolbarFlag {
   isRevealingToolbarForTabstrip_ = NO;
 }
 
 - (void)revealToolbarForTabStripChanges {
   isRevealingToolbarForTabstrip_ = YES;
 }
 
-- (void)exitPresentationMode {
+- (void)exitFullscreenMode {
 }
 
 @end
 
 @interface InfoBarContainerController(TestingAPI)
 - (BOOL)isTopInfoBarAnimationRunning;
 @end
 
 @implementation InfoBarContainerController(TestingAPI)
 - (BOOL)isTopInfoBarAnimationRunning {
@@ skipping 123 matching lines @@
     timer.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckBookmarkBarAnimation,
                    [controller() bookmarkBarController],
                    runner->QuitClosure()));
     runner->Run();
   }
 
   void VerifyFullscreenToolbarVisibility(fullscreen_mac::SlidingStyle style) {
-    EXPECT_EQ([[controller() presentationModeController] slidingStyle], 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)
       EXPECT_LE(NSMaxY(toolbarFrame), NSMaxY(screenFrame));
     else
       EXPECT_GE(NSMinY(toolbarFrame), NSMaxY(screenFrame));
   }
 
   NSInteger GetExpectedTopInfoBarTipHeight() {
@@ skipping 368 matching lines @@
   // 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(fullscreen_mac::OMNIBOX_TABS_PRESENT);
 
   // Toggle the visibility of the fullscreen toolbar. Verify that the toolbar
   // is hidden and the preference is correctly updated.
-  [[controller() presentationModeController] setToolbarFraction:0.0];
-  [[controller() presentationModeController] setMenuBarRevealProgress:0.0];
+  [[controller() fullscreenToolbarController] setToolbarFraction:0.0];
+  [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_FALSE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
   VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN);
 
   // Toggle out and back into fullscreen and verify that the toolbar is still
   // hidden.
   ToggleFullscreenAndWaitForNotification();
   ToggleFullscreenAndWaitForNotification();
-  [[controller() presentationModeController] setMenuBarRevealProgress:0.0];
+  [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
   VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_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) {
-  base::scoped_nsobject<MockPresentationModeController>
-      presentationModeController([[MockPresentationModeController alloc]
+  base::scoped_nsobject<MockFullscreenToolbarController>
+      fullscreenToolbarController([[MockFullscreenToolbarController alloc]
           initWithBrowserController:controller()]);
-  [controller() setPresentationModeController:presentationModeController.get()];
+  [controller()
+      setFullscreenToolbarController:fullscreenToolbarController.get()];
 
   ToggleFullscreenAndWaitForNotification();
 
   // Insert a non-NTP new tab in the foreground.
   AddTabAtIndex(0, GURL("http://google.com"), ui::PAGE_TRANSITION_LINK);
   ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]);
-  EXPECT_TRUE([presentationModeController isRevealingToolbarForTabstrip]);
-  [presentationModeController resetToolbarFlag];
+  EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
+  [fullscreenToolbarController resetToolbarFlag];
 
   // Insert a new tab in the background.
   AddTabAtBackground(0, GURL("about:blank"));
-  EXPECT_TRUE([presentationModeController isRevealingToolbarForTabstrip]);
-  [presentationModeController resetToolbarFlag];
+  EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
+  [fullscreenToolbarController resetToolbarFlag];
 
   // Insert a NTP new tab in the foreground.
   AddTabAtIndex(0, GURL("about:blank"), ui::PAGE_TRANSITION_LINK);
   ASSERT_TRUE([[controller() toolbarController] isLocationBarFocused]);
-  EXPECT_FALSE([presentationModeController isRevealingToolbarForTabstrip]);
-  [presentationModeController resetToolbarFlag];
+  EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
+  [fullscreenToolbarController resetToolbarFlag];
 
   // Insert a new tab in the background. The animation should not be triggered
   // since the location bar should still be focused.
   AddTabAtBackground(1, GURL("http://google.com"));
   ASSERT_TRUE([[controller() toolbarController] isLocationBarFocused]);
-  EXPECT_FALSE([presentationModeController isRevealingToolbarForTabstrip]);
-  [presentationModeController resetToolbarFlag];
+  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([presentationModeController isRevealingToolbarForTabstrip]);
-  [presentationModeController resetToolbarFlag];
+  EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
+  [fullscreenToolbarController resetToolbarFlag];
 }