Revert 178383

chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.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 "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ skipping 299 matching lines @@
   window_->set_reentrant(reentrant);
   FullscreenControllerStateTest::TestStateAndEvent(state, event, reentrant);
 }
 
 Browser* FullscreenControllerStateUnitTest::GetBrowser() {
   return BrowserWithTestWindowTest::browser();
 }
 
 // Tests -----------------------------------------------------------------------
 
-// Soak tests:
-
-// Tests all states with all permutations of multiple events to detect lingering
-// state issues that would bleed over to other states.
-// I.E. for each state test all combinations of events E1, E2, E3.
-//
-// This produces coverage for event sequences that may happen normally but
-// would not be exposed by traversing to each state via TransitionToState().
-// TransitionToState() always takes the same path even when multiple paths
-// exist.
-TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) {
-  // A tab is needed for tab fullscreen.
-  AddTab(browser(), GURL(chrome::kAboutBlankURL));
-  TestTransitionsForEachState();
-  // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
-}
-
-
-// Individual tests for each pair of state and event:
-
 #define TEST_EVENT_INNER(state, event, reentrant, reentrant_id) \
     TEST_F(FullscreenControllerStateUnitTest, \
            state##__##event##reentrant_id) { \
       AddTab(browser(), GURL(chrome::kAboutBlankURL)); \
       ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event, reentrant)) \
           << GetAndClearDebugLog(); \
     }
     // Progress of tests can be examined by inserting the following line:
     // LOG(INFO) << GetAndClearDebugLog(); }
 
 #define TEST_EVENT(state, event) \
     TEST_EVENT_INNER(state, event, false, ); \
     TEST_EVENT_INNER(state, event, true, _Reentrant);
 
+// Individual tests for each pair of state and event:
+
 TEST_EVENT(STATE_NORMAL, TOGGLE_FULLSCREEN);
 TEST_EVENT(STATE_NORMAL, TAB_FULLSCREEN_TRUE);
 TEST_EVENT(STATE_NORMAL, TAB_FULLSCREEN_FALSE);
 #if defined(OS_WIN)
 TEST_EVENT(STATE_NORMAL, METRO_SNAP_TRUE);
 TEST_EVENT(STATE_NORMAL, METRO_SNAP_FALSE);
 #endif
 TEST_EVENT(STATE_NORMAL, BUBBLE_EXIT_LINK);
 TEST_EVENT(STATE_NORMAL, BUBBLE_ALLOW);
 TEST_EVENT(STATE_NORMAL, BUBBLE_DENY);
@@ skipping 76 matching lines @@
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, TAB_FULLSCREEN_FALSE);
 #if defined(OS_WIN)
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, METRO_SNAP_TRUE);
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, METRO_SNAP_FALSE);
 #endif
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, BUBBLE_EXIT_LINK);
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, BUBBLE_ALLOW);
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, BUBBLE_DENY);
 TEST_EVENT(STATE_TO_TAB_FULLSCREEN, WINDOW_CHANGE);
 
-
 // Specific one-off tests for known issues:
 
 // TODO(scheib) Toggling Tab fullscreen while pending Tab or
 // Browser fullscreen is broken currently http://crbug.com/154196
 TEST_F(FullscreenControllerStateUnitTest,
        DISABLED_ToggleTabWhenPendingBrowser) {
 #if !defined(OS_WIN)  // Only possible without reentrancy
   AddTab(browser(), GURL(chrome::kAboutBlankURL));
   ASSERT_NO_FATAL_FAILURE(
       TransitionToState(STATE_TO_BROWSER_FULLSCREEN_NO_CHROME))
@@ skipping 13 matching lines @@
   ASSERT_NO_FATAL_FAILURE(
       TransitionToState(STATE_TO_TAB_FULLSCREEN))
       << GetAndClearDebugLog();
 
   ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_FALSE)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog();
 #endif
 }
 
+// Soak tests:
+
+// Tests all states with all permutations of multiple events to detect lingering
+// state issues that would bleed over to other states.
+// I.E. for each state test all combinations of events E1, E2, E3.
+//
+// This produces coverage for event sequences that may happen normally but
+// would not be exposed by traversing to each state via TransitionToState().
+// TransitionToState() always takes the same path even when multiple paths
+// exist.
+TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) {
+  // A tab is needed for tab fullscreen.
+  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  TestTransitionsForEachState();
+  // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
+}
+