content/browser/frame_host/frame_tree_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/frame_host/frame_tree_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/download/save_package_browsertest.cc ('k') | content/browser/frame_host/navigation_controller_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/frame_tree_browsertest.cc

diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc

index a0450de934bd091aff5a65f218748f08409f998a..b9e3b43bd796c24b40ff46857c2b4f2dbdd0d546 100644

--- a/content/browser/frame_host/frame_tree_browsertest.cc

+++ b/content/browser/frame_host/frame_tree_browsertest.cc

@@ -33,7 +33,7 @@ class FrameTreeBrowserTest : public ContentBrowserTest {

void SetUpOnMainThread() override {

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

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

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

SetupCrossSiteRedirector(embedded_test_server());

}

@@ -322,7 +322,7 @@ class CrossProcessFrameTreeBrowserTest : public ContentBrowserTest {

void SetUpOnMainThread() override {

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

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

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

SetupCrossSiteRedirector(embedded_test_server());

}