Merge 275988 "Move about://-related constants from //content to ..."

chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc

Index: chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
===================================================================
--- chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc	(revision 276109)
+++ chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc	(working copy)
@@ -54,8 +54,7 @@
 IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
                        DISABLED_TransitionsForEachState) {
   // A tab is needed for tab fullscreen.
-  AddTabAtIndex(0, GURL(content::kAboutBlankURL),
-                content::PAGE_TRANSITION_TYPED);
+  AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
   TestTransitionsForEachState();
   // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
 }
@@ -66,17 +65,16 @@
 // An "empty" test is included as part of each "TEST_EVENT" because it makes
 // running the entire test suite less flaky on MacOS. All of the tests pass
 // when run individually.
-#define TEST_EVENT(state, event) \
-    IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \
-                           DISABLED_##state##__##event##__Empty) { \
-    } \
-    IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \
-                           DISABLED_##state##__##event) { \
-      AddTabAtIndex(0, GURL(content::kAboutBlankURL), \
-                    content::PAGE_TRANSITION_TYPED); \
-      ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \
-          << GetAndClearDebugLog(); \
-    }
+#define TEST_EVENT(state, event)                                       \
+  IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,     \
+                         DISABLED_##state##__##event##__Empty) {}      \
+  IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,     \
+                         DISABLED_##state##__##event) {                \
+    AddTabAtIndex(                                                     \
+        0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); \
+    ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event))           \
+        << GetAndClearDebugLog();                                      \
+  }
     // Progress of tests can be examined by inserting the following line:
     // LOG(INFO) << GetAndClearDebugLog(); }
 
@@ -89,8 +87,7 @@
 IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
                        DISABLED_ManualTest) {
   // A tab is needed for tab fullscreen.
-  AddTabAtIndex(0, GURL(content::kAboutBlankURL),
-                content::PAGE_TRANSITION_TYPED);
+  AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog();
   ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog();