Revert 178383

chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.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/browser_window.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h"
@@ skipping 81 matching lines @@
                                                        event,
                                                        reentrant);
 }
 
 Browser* FullscreenControllerStateInteractiveTest::GetBrowser() {
   return InProcessBrowserTest::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.
-IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
-                       DISABLED_TransitionsForEachState) {
-  // A tab is needed for tab fullscreen.
-  AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
-  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) \
     IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \
                            DISABLED_##state##__##event##reentrant_id) { \
       AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); \
       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:
 
 // Used manually to determine what happens on a platform.
 IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
                        DISABLED_ManualTest) {
   // A tab is needed for tab fullscreen.
   AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog();
 
   // Wait, allowing human operator to observe the result.
   scoped_refptr<content::MessageLoopRunner> message_loop;
   message_loop = new content::MessageLoopRunner();
   message_loop->Run();
 }
 
+// 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.
+IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
+                       DISABLED_TransitionsForEachState) {
+  // A tab is needed for tab fullscreen.
+  AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
+  TestTransitionsForEachState();
+  // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
+}
+