content/browser/renderer_host/render_view_host_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/renderer_host/render_view_host_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/renderer_host/render_process_host_browsertest.cc ('k') | content/browser/security_exploit_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_browsertest.cc

diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc

index 2fdaf0aa833505080b3a4369c64322b7f0ff3e5d..feb495793f6e7dc5c2e9db845879ac1e01dae623 100644

--- a/content/browser/renderer_host/render_view_host_browsertest.cc

+++ b/content/browser/renderer_host/render_view_host_browsertest.cc

@@ -62,7 +62,7 @@ class RenderViewHostTestWebContentsObserver : public WebContentsObserver {

};

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {

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

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

RenderViewHostTestWebContentsObserver observer(shell()->web_contents());

GURL test_url = embedded_test_server()->GetURL("/simple_page.html");

@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) {

}

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {

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

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

RenderViewHostTestWebContentsObserver observer(shell()->web_contents());

// Base URL is not set if it is the same as the URL.

@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {

// This test ensures a RenderFrameHost object is created for the top level frame

// in each RenderViewHost.

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BasicRenderFrameHost) {

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

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

GURL test_url = embedded_test_server()->GetURL("/simple_page.html");

NavigateToURL(shell(), test_url);

@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BasicRenderFrameHost) {

}

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, IsFocusedElementEditable) {

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

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

GURL test_url = embedded_test_server()->GetURL("/touch_selection.html");

NavigateToURL(shell(), test_url);

@@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, IsFocusedElementEditable) {

}

IN_PROC_BROWSER_TEST_F(RenderViewHostTest, ReleaseSessionOnCloseACK) {

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

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

GURL test_url = embedded_test_server()->GetURL(

"/access-session-storage.html");

NavigateToURL(shell(), test_url);