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

Unified Diff: content/browser/renderer_host/render_view_host_manager_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/renderer_host/render_view_host_manager_browsertest.cc
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index a2ce269c8339e966c66662b60691dffa1251143e..ef57b7079008dc0518b28c86c5e4860ad4026194 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -112,7 +112,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
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());
// Load a page with links that open in a new window.
@@ -180,7 +181,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -233,7 +235,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -286,7 +289,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -334,7 +338,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -380,7 +385,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -463,7 +469,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
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());
// Load a page with links that open in a new window.
@@ -551,7 +558,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -689,7 +697,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -760,7 +769,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -827,7 +837,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
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());
// Load a page with links that open in a new window.
@@ -890,7 +901,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) {
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());
// Visit a page on first site.
@@ -1005,7 +1017,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// Load a page with links that open in a new window.
@@ -1131,7 +1144,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
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());
// Observe the created render_view_host's to make sure they will not leak.
@@ -1202,7 +1216,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
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"))));
EXPECT_TRUE(https_server.Start());
GURL frame_tree_url(test_server()->GetURL("files/frame_tree/top.html"));
@@ -1371,7 +1386,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
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());
// 1. Load a page that deletes its iframe during unload.

Powered by Google App Engine
This is Rietveld 408576698