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

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 12210088: Make the TestServer use an absolute document root path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testserver uses absolute docroot path Created 7 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/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 47685bc79f5bf005af3a8fe52064ccb39399e912..52383d5b444a8228c3cfa909ba087ea5e4df9323 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1561,7 +1561,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsIframeTimeout) {
// Use an HTTPS server for the top level page.
net::TestServer https_server(
net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_server.Start());
GURL url = https_server.GetURL(kTestServerIframeTimeoutPath);
@@ -1616,7 +1616,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) {
net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
net::TestServer https_server(
net::TestServer::TYPE_HTTPS, ssl_options,
- base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_server.Start());
GURL ssl_login_url = https_server.GetURL(kTestServerLoginPath);
@@ -1704,7 +1704,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) {
net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
net::TestServer https_server(
net::TestServer::TYPE_HTTPS, https_options,
- base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_server.Start());
// The path does not matter.
@@ -2160,7 +2160,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsToHttpRedirect) {
// Use an HTTPS server for the top level page.
net::TestServer https_server(
net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_server.Start());
GURL http_timeout_url =
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | net/test/base_test_server.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698