| 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 =
|
|
|