| 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 13286a9b8380c7fd50be76618fe669aa4d5e5835..08b0df2a2772d0e96e962f5fc2a66bc76728819a 100644
|
| --- a/net/test/spawned_test_server/remote_test_server.cc
|
| +++ b/net/test/spawned_test_server/remote_test_server.cc
|
| @@ -67,8 +67,7 @@ std::string GetServerTypeString(BaseTestServer::Type type) {
|
| RemoteTestServer::RemoteTestServer(Type type,
|
| const std::string& host,
|
| const base::FilePath& document_root)
|
| - : BaseTestServer(type, host),
|
| - spawner_server_port_(0) {
|
| + : BaseTestServer(type, host), spawner_server_port_(0) {
|
| if (!Init(document_root))
|
| NOTREACHED();
|
| }
|
| @@ -76,8 +75,7 @@ RemoteTestServer::RemoteTestServer(Type type,
|
| RemoteTestServer::RemoteTestServer(Type type,
|
| const SSLOptions& ssl_options,
|
| const base::FilePath& document_root)
|
| - : BaseTestServer(type, ssl_options),
|
| - spawner_server_port_(0) {
|
| + : BaseTestServer(type, ssl_options), spawner_server_port_(0) {
|
| if (!Init(document_root))
|
| NOTREACHED();
|
| }
|
| @@ -197,12 +195,13 @@ bool RemoteTestServer::Init(const base::FilePath& document_root) {
|
| 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"));
|
| + SetResourcePath(fixed_root,
|
| + base::FilePath()
|
| + .AppendASCII("net")
|
| + .AppendASCII("data")
|
| + .AppendASCII("ssl")
|
| + .AppendASCII("certificates"));
|
| return true;
|
| }
|
|
|
| } // namespace net
|
| -
|
|
|