Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8763)

Unified Diff: chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
index 01c7ac3029364765c91fdb0abb1b4620a6c3acb2..e828c8a69c6464e5ad386e022714ae4dadf45175 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
@@ -54,7 +54,7 @@ Browser* FullscreenControllerStateInteractiveTest::GetBrowser() {
IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
DISABLED_TransitionsForEachState) {
// A tab is needed for tab fullscreen.
- AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
+ AddTabAtIndex(0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED);
TestTransitionsForEachState();
// Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog();
}
@@ -65,15 +65,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
// 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(url::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), ui::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(); }
@@ -87,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest,
DISABLED_ManualTest) {
// A tab is needed for tab fullscreen.
- AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
+ AddTabAtIndex(0, GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_TYPED);
ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog();
ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog();
ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog();

Powered by Google App Engine
This is Rietveld 408576698