chrome/browser/extensions/chrome_app_api_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/chrome_app_api_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/extensions/background_xhr_browsertest.cc ('k') | chrome/browser/extensions/content_capabilities_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_app_api_browsertest.cc

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

index d112f359de499b140c0e986c34edac39033fccc8..108d57b5f3cd5cfed0056d57206db24ff2e8477c 100644

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

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

@@ -90,7 +90,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest {

IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {

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

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

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

GURL app_url =

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

GURL non_app_url = embedded_test_server()->GetURL(

@@ -169,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) {

IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {

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

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

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

GURL app_url = embedded_test_server()->GetURL(

"app.com", "/extensions/get_app_details_for_frame.html");

GURL non_app_url = embedded_test_server()->GetURL(

@@ -226,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {

IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) {

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

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

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

GURL app_url = embedded_test_server()->GetURL(

"app.com", "/extensions/get_app_details_for_frame_reversed.html");