chrome/browser/extensions/active_script_controller_browsertest.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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: chrome/browser/extensions/active_script_controller_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: 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 | « chrome/browser/errorpage_browsertest.cc ('k') | chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/active_script_controller_browsertest.cc

diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc

index e28bf6627dbf11cc000c50baf38ff38e6f98ad10..ce802129867b19a84efc2a671a9ce86d9fc1d67d 100644

--- a/chrome/browser/extensions/active_script_controller_browsertest.cc

+++ b/chrome/browser/extensions/active_script_controller_browsertest.cc

@@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest,

// Navigate to an URL (which matches the explicit host specified in the

// extension content_scripts_explicit_hosts). All four extensions should

// inject the script.

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

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

ui_test_utils::NavigateToURL(

browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));

@@ -376,7 +376,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest,

ActiveScriptController::GetForWebContents(web_contents);

ASSERT_TRUE(active_script_controller);

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

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

ui_test_utils::NavigateToURL(

browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));

@@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest,

false /* won't reply */));

inject_success_listener.set_extension_id(extension->id());

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

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

GURL url = embedded_test_server()->GetURL("/extensions/test_file.html");

ui_test_utils::NavigateToURL(browser(), url);

@@ -488,7 +488,7 @@ IN_PROC_BROWSER_TEST_F(FlagOffActiveScriptControllerBrowserTest,

EXECUTE_SCRIPT),

};

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

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

ui_test_utils::NavigateToURL(

browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));