chrome/browser/chrome_content_browser_client_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/chrome_content_browser_client_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/captive_portal/captive_portal_browsertest.cc ('k') | chrome/browser/chrome_security_exploit_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client_browsertest.cc

diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc

index 3a2e65f276db65c926c3afe63e46d1bc1b48a798..af7c13bfb1bf333ea816c840415ea7355f54c170 100644

--- a/chrome/browser/chrome_content_browser_client_browsertest.cc

+++ b/chrome/browser/chrome_content_browser_client_browsertest.cc

@@ -12,6 +12,7 @@

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/browser_test_utils.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

#include "url/gurl.h"

namespace content {

@@ -102,8 +103,8 @@ class ChromeContentBrowserClientSitePerProcessTest

// such as http://crbug.com/164223.

IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientSitePerProcessTest,

SitePerProcessNavigation) {

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

- const GURL url(test_server()->GetURL("files/title1.html"));

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

+ const GURL url(embedded_test_server()->GetURL("/title1.html"));

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

NavigationEntry* entry = GetLastCommittedEntry();