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

Unified Diff: content/browser/site_per_process_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: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 99ce0c94b5db4d2b2d09bf2cf2f9f45a47f93da4..4f4b48630c14bc235a0e8d1efb102f914531dbdf 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -169,7 +169,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrossSiteIframe) {
net::TestServer https_server(
net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("content/test/data")));
+ net::TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("content/test/data"))));
ASSERT_TRUE(https_server.Start());
GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));
@@ -201,7 +202,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
net::TestServer https_server(
net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("content/test/data")));
+ net::TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("content/test/data"))));
ASSERT_TRUE(https_server.Start());
GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));
@@ -325,7 +327,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
net::TestServer https_server(
net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("content/test/data")));
+ net::TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("content/test/data"))));
ASSERT_TRUE(https_server.Start());
GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));

Powered by Google App Engine
This is Rietveld 408576698