Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms.

chrome/browser/ui/fullscreen/fullscreen_controller_state_test.cc

 // 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.
 
 #include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h"
 
 #include <memory.h>
 
 #include <iomanip>
 #include <iostream>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "content/public/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
+
 FullscreenControllerStateTest::FullscreenControllerStateTest()
     : state_(STATE_NORMAL),
       reentrant_(false) {
   // Human specified state machine data.
   // For each state, for each event, define the resulting state.
   State transition_table_data[][NUM_EVENTS] = {
     { // STATE_NORMAL:
       STATE_TO_BROWSER_FULLSCREEN_NO_CHROME,  // Event TOGGLE_FULLSCREEN
       STATE_TO_TAB_FULLSCREEN,                // Event TAB_FULLSCREEN_TRUE
       STATE_NORMAL,                           // Event TAB_FULLSCREEN_FALSE
@@ skipping 257 matching lines @@
 
   debugging_log_ << "  InvokeEvent(" << std::left
       << std::setw(MAX_EVENT_NAME_LENGTH) << GetEventString(event)
       << ") to "
       << std::setw(MAX_STATE_NAME_LENGTH) << GetStateString(next_state);
 
   state_ = next_state;
 
   switch (event) {
     case TOGGLE_FULLSCREEN:
+#if defined(OS_MACOSX)
+      GetFullscreenController()->TogglePresentationMode();
+#else
       GetFullscreenController()->ToggleFullscreenMode();
+#endif
       break;
     case TAB_FULLSCREEN_TRUE:
       GetFullscreenController()->ToggleFullscreenModeForTab(
            chrome::GetActiveWebContents(GetBrowser()), true);
       break;
     case TAB_FULLSCREEN_FALSE:
       GetFullscreenController()->ToggleFullscreenModeForTab(
            chrome::GetActiveWebContents(GetBrowser()), false);
       break;
 #if defined(OS_WIN)
@@ skipping 29 matching lines @@
 
   VerifyWindowState();
 
   return true;
 }
 
 void FullscreenControllerStateTest::VerifyWindowState() {
   switch (state_) {
     case STATE_NORMAL:
 #if defined(OS_MACOSX)
-      EXPECT_FALSE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
 #endif
       EXPECT_FALSE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsFullscreenForTabOrPending())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
     case STATE_BROWSER_FULLSCREEN_NO_CHROME:
 #if defined(OS_MACOSX)
-      EXPECT_FALSE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_TRUE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
 #endif
       EXPECT_TRUE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsFullscreenForTabOrPending())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
 #if defined(OS_WIN)
     case STATE_METRO_SNAP:
-      // No expectation for InPresentationMode.
+      // http://crbug.com/169138
+      // No expectation for IsFullscreenWithChrome() or
+      // IsFullscreenWithoutChrome()
 
       // TODO(scheib) IsFullscreenForBrowser and IsFullscreenForTabOrPending
       // are returning true and false in interactive tests with real window.
       // With only a single Metro Snap state in this test framework it isn't
       // fair to try to have an expectation anyway.
       //
       // No expectation for IsFullscreenForBrowser.
       // No expectation for IsFullscreenForTabOrPending.
       EXPECT_TRUE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
 #endif
     case STATE_TAB_FULLSCREEN:
 #if defined(OS_MACOSX)
-      EXPECT_TRUE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_TRUE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
 #endif
       EXPECT_FALSE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
       EXPECT_TRUE(GetFullscreenController()->IsFullscreenForTabOrPending())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
     case STATE_TAB_BROWSER_FULLSCREEN:
 #if defined(OS_MACOSX)
-      EXPECT_FALSE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_TRUE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
 #endif
       EXPECT_TRUE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
       EXPECT_TRUE(GetFullscreenController()->IsFullscreenForTabOrPending())
           << GetAndClearDebugLog();
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
     case STATE_TO_NORMAL:
 #if defined(OS_MACOSX)
-      EXPECT_FALSE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
 #endif
       // No expectation for IsFullscreenForBrowser.
       // No expectation for IsFullscreenForTabOrPending.
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
       break;
     case STATE_TO_BROWSER_FULLSCREEN_NO_CHROME:
 #if defined(OS_MACOSX)
-      EXPECT_FALSE(GetBrowser()->window()->InPresentationMode())
+      EXPECT_FALSE(GetBrowser()->window()->IsFullscreenWithChrome())
+          << GetAndClearDebugLog();
+      EXPECT_TRUE(GetBrowser()->window()->IsFullscreenWithoutChrome())
           << GetAndClearDebugLog();
       EXPECT_TRUE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
 #else
       EXPECT_FALSE(GetFullscreenController()->IsFullscreenForBrowser())
           << GetAndClearDebugLog();
 #endif
       // No expectation for IsFullscreenForTabOrPending.
       EXPECT_FALSE(GetFullscreenController()->IsInMetroSnapMode())
           << GetAndClearDebugLog();
@@ skipping 173 matching lines @@
       << GetAndClearDebugLog();
 
   debugging_log_ << " Then,\n";
   ASSERT_TRUE(InvokeEvent(event)) << GetAndClearDebugLog();
 }
 
 FullscreenController* FullscreenControllerStateTest::GetFullscreenController() {
     return GetBrowser()->fullscreen_controller();
 }