mac, fullscreen: Major refactor.

chrome/browser/ui/cocoa/browser_window_controller_unittest.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 "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 813 matching lines @@
 void WaitForFullScreenTransition() {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_FULLSCREEN_CHANGED,
       content::NotificationService::AllSources());
   observer.Wait();
 }
 
 // http://crbug.com/53586
 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
   [controller_ showWindow:nil];
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInAnyFullscreenMode]);
 
-  [controller_ enterFullscreen];
+  [controller_ enterFullscreenWithChrome];
   WaitForFullScreenTransition();
-  EXPECT_TRUE([controller_ isFullscreen]);
+  EXPECT_TRUE([controller_ isInAnyFullscreenMode]);
 
-  [controller_ exitFullscreen];
+  [controller_ exitAnyFullscreen];
   WaitForFullScreenTransition();
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInAnyFullscreenMode]);
 }
 
 // If this test fails, it is usually a sign that the bots have some sort of
 // problem (such as a modal dialog up).  This tests is a very useful canary, so
 // please do not mark it as flaky without first verifying that there are no bot
 // problems.
 // http://crbug.com/53586
 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
   [controller_ showWindow:nil];
 
-  EXPECT_FALSE([controller_ isFullscreen]);
+  EXPECT_FALSE([controller_ isInAnyFullscreenMode]);
 
   [controller_ activate];
   EXPECT_TRUE(IsFrontWindow([controller_ window]));
 
-  [controller_ enterFullscreen];
+  [controller_ enterFullscreenWithChrome];
   WaitForFullScreenTransition();
   [controller_ activate];
 
   // No fullscreen window on 10.7+.
   if (base::mac::IsOSSnowLeopard())
     EXPECT_TRUE(IsFrontWindow([controller_ createFullscreenWindow]));
 
   // We have to cleanup after ourselves by unfullscreening.
-  [controller_ exitFullscreen];
+  [controller_ exitAnyFullscreen];
   WaitForFullScreenTransition();
 }
 
 @implementation BrowserWindowControllerFakeFullscreen
 // Override |-createFullscreenWindow| to return a dummy window. This isn't
 // needed to pass the test, but because the dummy window is only 100x100, it
 // prevents the real fullscreen window from flashing up and taking over the
 // whole screen. We have to return an actual window because |-layoutSubviews|
 // looks at the window's frame.
 - (NSWindow*)createFullscreenWindow {
   if (testFullscreenWindow_.get())
     return testFullscreenWindow_.get();
 
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */