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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase bug. Created 5 years, 1 month 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
« chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc ('K') | « chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc ('k') | chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc » ('j') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
index 868bb348bcc0e9ce693ba0be135142738d757ec7..1f3ab909cfd69bcee35d44275e1d4d007e9ce61d 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
@@ -19,6 +19,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
using url::kAboutBlankURL;
using content::WebContents;
@@ -26,7 +27,7 @@ using ui::PAGE_TRANSITION_TYPED;
namespace {
-const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html");
+const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("/simple.html");
} // namespace
@@ -100,7 +101,7 @@ void FullscreenControllerInteractiveTest::ToggleBrowserFullscreen(
// Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
void
FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() {
- GURL url = test_server()->GetURL("simple.html");
+ GURL url = embedded_test_server()->GetURL("/simple.html");
AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
// Validate that going fullscreen for a URL defaults to asking permision.
@@ -185,7 +186,7 @@ void FullscreenControllerInteractiveTest::ToggleTabFullscreen_Internal(
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_TestNewTabExitsFullscreen) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
@@ -203,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_TestTabExitsItselfFromFullscreen) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
@@ -216,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_TestFullscreenBubbleMouseLockState) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
@@ -302,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_TestTabExitsFullscreenOnNavigation) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
@@ -315,7 +316,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_TestTabExitsFullscreenOnGoBack) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
@@ -332,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
IN_PROC_BROWSER_TEST_F(
FullscreenControllerInteractiveTest,
DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
GURL url(ui_test_utils::GetTestUrl(base::FilePath(
base::FilePath::kCurrentDirectory), base::FilePath(kSimpleFile)));
@@ -349,7 +350,7 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
FullscreenControllerInteractiveTest,
DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
@@ -367,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(
// http://crbug.com/100467
IN_PROC_BROWSER_TEST_F(
FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
@@ -405,9 +406,9 @@ IN_PROC_BROWSER_TEST_F(
// Tests mouse lock can be escaped with ESC key.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -455,9 +456,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) {
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_EscapingMouseLockAndFullscreen) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -517,9 +518,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_MouseLockThenFullscreen) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -574,9 +575,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Tests mouse lock then fullscreen in same request.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_MouseLockAndFullscreen) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -633,9 +634,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Test is flaky: http://crbug.com/146006
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_PrivilegedMouseLockAndFullscreen) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -669,9 +670,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// with no UI distraction for users.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_MouseLockSilentAfterTargetUnlock) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsFullscreenBubbleDisplayed());
@@ -756,9 +757,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Tests mouse lock is exited on page navigation.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabExitsMouseLockOnNavigation) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
// Lock the mouse with a user gesture.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
@@ -781,12 +782,12 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Tests mouse lock is exited when navigating back.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabExitsMouseLockOnGoBack) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
// Navigate twice to provide a place to go back to.
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
// Lock the mouse with a user gesture.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
@@ -816,10 +817,10 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Tests mouse lock is not exited on sub frame navigation.
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
// Create URLs for test page and test page with #fragment.
- GURL url(test_server()->GetURL(kFullscreenMouseLockHTML));
+ GURL url(embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
GURL url_with_fragment(url.spec() + "#fragment");
// Navigate to test page.
@@ -848,9 +849,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// mac: http://crbug.com/103912
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
DISABLED_ReloadExitsMouseLockAndFullscreen) {
- ASSERT_TRUE(test_server()->Start());
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(kFullscreenMouseLockHTML));
+ ASSERT_TRUE(embedded_test_server()->Start());
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
ASSERT_FALSE(IsMouseLockPermissionRequested());
@@ -924,7 +925,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// TestFullscreenMouseLockContentSettings.
// http://crbug.com/133831
- GURL url = test_server()->GetURL("simple.html");
+ GURL url = embedded_test_server()->GetURL("/simple.html");
AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
// Validate that going fullscreen for a URL defaults to asking permision.
« chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc ('K') | « chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc ('k') | chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc » ('j') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698