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

Unified Diff: chrome/browser/ui/browser_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/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index d75c2b208b7514eaf72e5fa5882c1c74c5b09ef7..7e799f5667a090e90a24846b7a932705a3050c3e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -105,9 +105,6 @@ const base::FilePath::CharType* kBeforeUnloadFile =
const base::FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
const base::FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
-const base::FilePath::CharType kDocRoot[] =
- FILE_PATH_LITERAL("chrome/test/data");
-
// Given a page title, returns the expected window caption string.
string16 WindowCaptionFromPageTitle(const string16& page_title) {
#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
@@ -527,7 +524,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
ASSERT_TRUE(test_server()->Start());
net::TestServer https_test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_test_server.Start());
GURL http_url(test_server()->GetURL("files/title1.html"));
GURL https_url(https_test_server.GetURL(""));
@@ -616,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
ASSERT_TRUE(test_server()->Start());
net::TestServer https_test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(https_test_server.Start());
GURL http_url(test_server()->GetURL("files/title1.html"));
GURL https_url(https_test_server.GetURL(""));
@@ -731,7 +728,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) {
net::TestServer test_server(net::TestServer::TYPE_HTTPS,
net::TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL https_url(test_server.GetURL("/"));
ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme));
@@ -745,7 +742,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
net::TestServer test_server(net::TestServer::TYPE_FTP,
net::TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ net::TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL ftp_url(test_server.GetURL(""));
ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme));

Powered by Google App Engine
This is Rietveld 408576698