mac: Major fullscreen refactor.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index 5e173d9f660309fb66f1f7e6b10de8425ea7366c..84d2b6c9465c1d4b0f5e4881c61638091ffb9d81 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -831,15 +831,15 @@ void WaitForFullScreenTransition() {
 // http://crbug.com/53586
 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
   [controller_ showWindow:nil];
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInOrEnteringAnyFullscreenMode]);
 
-  [controller_ enterFullscreen];
+  [controller_ enterFullscreenWithChrome];
   WaitForFullScreenTransition();
-  EXPECT_TRUE([controller_ isFullscreen]);
+  EXPECT_TRUE([controller_ isInOrEnteringAnyFullscreenMode]);
 
-  [controller_ exitFullscreen];
+  [controller_ exitGenericFullscreen];
   WaitForFullScreenTransition();
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInOrEnteringAnyFullscreenMode]);
 }
 
 // If this test fails, it is usually a sign that the bots have some sort of
@@ -850,12 +850,12 @@ TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
   [controller_ showWindow:nil];
 
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInOrEnteringAnyFullscreenMode]);
 
   [controller_ activate];
   EXPECT_TRUE(IsFrontWindow([controller_ window]));
 
-  [controller_ enterFullscreen];
+  [controller_ enterFullscreenWithChrome];
   WaitForFullScreenTransition();
   [controller_ activate];
 
@@ -864,7 +864,7 @@ TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
     EXPECT_TRUE(IsFrontWindow([controller_ createFullscreenWindow]));
 
   // We have to cleanup after ourselves by unfullscreening.
-  [controller_ exitFullscreen];
+  [controller_ exitGenericFullscreen];
   WaitForFullScreenTransition();
 }