| Index: net/test/spawned_test_server/remote_test_server.cc
|
| diff --git a/net/test/spawned_test_server/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc
|
| index 594c5d488b480a717472259a860989ebeb5bfe89..13286a9b8380c7fd50be76618fe669aa4d5e5835 100644
|
| --- a/net/test/spawned_test_server/remote_test_server.cc
|
| +++ b/net/test/spawned_test_server/remote_test_server.cc
|
| @@ -192,7 +192,12 @@ bool RemoteTestServer::Init(const base::FilePath& document_root) {
|
| return false;
|
| SetPort(test_server_port);
|
|
|
| - SetResourcePath(document_root, base::FilePath().AppendASCII("net")
|
| + // Unlike LocalTestServer, RemoteTestServer passes relative paths to the test
|
| + // server. The test server fails on empty strings in some configurations.
|
| + base::FilePath fixed_root = document_root;
|
| + if (fixed_root.empty())
|
| + fixed_root = base::FilePath(base::FilePath::kCurrentDirectory);
|
| + SetResourcePath(fixed_root, base::FilePath().AppendASCII("net")
|
| .AppendASCII("data")
|
| .AppendASCII("ssl")
|
| .AppendASCII("certificates"));
|
|
|