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

Unified Diff: chrome/browser/net/proxy_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/net/proxy_browsertest.cc
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index 791c16baec1311e84c54758c39fb5476956025df..13ec47115ea5a92b0f68b8272946d66b621739d3 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -60,7 +60,7 @@ class ProxyBrowserTest : public InProcessBrowserTest {
ProxyBrowserTest()
: proxy_server_(net::TestServer::TYPE_BASIC_AUTH_PROXY,
net::TestServer::kLocalhost,
- base::FilePath()) {
+ net::TestServer::GetSourcePath()) {
}
virtual void SetUp() OVERRIDE {
@@ -93,7 +93,8 @@ IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) {
// Launch WebSocket server.
net::TestServer ws_server(net::TestServer::TYPE_WS,
net::TestServer::kLocalhost,
- net::GetWebSocketTestDataDirectory());
+ net::TestServer::GetSourceRelativePath(
+ net::GetWebSocketTestDataDirectory()));
ASSERT_TRUE(ws_server.Start());
content::WebContents* tab =

Powered by Google App Engine
This is Rietveld 408576698