Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1094)

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 9372065: Update clients to use new TestServer constructor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove files that were reviewed and committed separately. Created 8 years, 10 months 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
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index c98d0bfe929fbb4f0ed7695350b44021af56d8a2..57a3f49571d4a83287aed88eeb1f9d977b64c021 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -708,6 +708,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest {
if (use_https_src_server_) {
https_src_server.reset(
new net::TestServer(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
ASSERT_TRUE(https_src_server->Start());
src_server = https_src_server.get();
@@ -968,6 +969,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
// Checks that a prerender for an https will prevent a prerender from happening.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) {
net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
@@ -980,6 +982,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) {
// Checks that client-issued redirects to an https page will cancel prerenders.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) {
net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
@@ -1014,6 +1017,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) {
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
PrerenderClientRedirectToHttpsInIframe) {
net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
@@ -1058,6 +1062,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
PrerenderServerRedirectToHttps) {
net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
@@ -1092,6 +1097,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) {
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
PrerenderServerRedirectToHttpsInIframe) {
net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
« no previous file with comments | « chrome/browser/notifications/notifications_interactive_uitest.cc ('k') | chrome/browser/referrer_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698