content/browser/devtools/protocol/devtools_protocol_browsertest.cc - Issue 1411073005: Migrating tests to use EmbeddedTestServer (/content)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/devtools/protocol/devtools_protocol_browsertest.cc

Issue 1411073005: Migrating tests to use EmbeddedTestServer (/content) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. 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

« no previous file with comments | « content/browser/cross_site_transfer_browsertest.cc ('k') | content/browser/devtools/site_per_process_devtools_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/protocol/devtools_protocol_browsertest.cc

diff --git a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc

index c2fc38f1dcdb31411c3c99084f0e335a79f0a764..2a7bf358e6db46c74e0df393f982cfaee1ef25a0 100644

--- a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc

+++ b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc

@@ -331,8 +331,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, SynthesizeTapGesture) {

#endif // defined(OS_ANDROID)

IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, NavigationPreservesMessages) {

- ASSERT_TRUE(test_server()->Start());

- GURL test_url = test_server()->GetURL("files/devtools/navigation.html");

+ ASSERT_TRUE(embedded_test_server()->Start());

+ GURL test_url = embedded_test_server()->GetURL("/devtools/navigation.html");

NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);

Attach();

SendCommand("Page.enable", nullptr, false);

@@ -361,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, NavigationPreservesMessages) {

IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, CrossSiteNoDetach) {

host_resolver()->AddRule("*", "127.0.0.1");

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

content::SetupCrossSiteRedirector(embedded_test_server());

GURL test_url1 = embedded_test_server()->GetURL(

@@ -377,8 +377,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, CrossSiteNoDetach) {

}

IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, ReconnectPreservesState) {

- ASSERT_TRUE(test_server()->Start());

- GURL test_url = test_server()->GetURL("files/devtools/navigation.html");

+ ASSERT_TRUE(embedded_test_server()->Start());

+ GURL test_url = embedded_test_server()->GetURL("/devtools/navigation.html");

NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);

Shell* second = CreateBrowser();

@@ -394,7 +394,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, ReconnectPreservesState) {

IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, CrossSitePauseInBeforeUnload) {

host_resolver()->AddRule("*", "127.0.0.1");

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

content::SetupCrossSiteRedirector(embedded_test_server());

NavigateToURLBlockUntilNavigationsComplete(shell(),