| Index: net/tools/testserver/run_testserver.cc
|
| diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
|
| index 342209ce51a7633ae7cad07cf305f4b5cf77f682..e0890200d4da13b5c7172494272676dc7a846cc7 100644
|
| --- a/net/tools/testserver/run_testserver.cc
|
| +++ b/net/tools/testserver/run_testserver.cc
|
| @@ -14,9 +14,10 @@
|
| #include "net/test/spawned_test_server/spawned_test_server.h"
|
|
|
| static void PrintUsage() {
|
| - printf("run_testserver --doc-root=relpath\n"
|
| - " [--http|--https|--ws|--wss|--ftp]\n"
|
| - " [--ssl-cert=ok|mismatched-name|expired]\n");
|
| + printf(
|
| + "run_testserver --doc-root=relpath\n"
|
| + " [--http|--https|--ws|--wss|--ftp]\n"
|
| + " [--ssl-cert=ok|mismatched-name|expired]\n");
|
| printf("(NOTE: relpath should be relative to the 'src' directory.\n");
|
| }
|
|
|
| @@ -38,8 +39,7 @@ int main(int argc, const char* argv[]) {
|
|
|
| TestTimeouts::Initialize();
|
|
|
| - if (command_line->GetSwitches().empty() ||
|
| - command_line->HasSwitch("help")) {
|
| + if (command_line->GetSwitches().empty() || command_line->HasSwitch("help")) {
|
| PrintUsage();
|
| return -1;
|
| }
|
| @@ -101,9 +101,7 @@ int main(int argc, const char* argv[]) {
|
| new net::SpawnedTestServer(server_type, ssl_options, doc_root));
|
| } else {
|
| test_server.reset(new net::SpawnedTestServer(
|
| - server_type,
|
| - net::SpawnedTestServer::kLocalhost,
|
| - doc_root));
|
| + server_type, net::SpawnedTestServer::kLocalhost, doc_root));
|
| }
|
|
|
| if (!test_server->Start()) {
|
| @@ -113,8 +111,8 @@ int main(int argc, const char* argv[]) {
|
|
|
| if (!base::DirectoryExists(test_server->document_root())) {
|
| printf("Error: invalid doc root: \"%s\" does not exist!\n",
|
| - base::UTF16ToUTF8(
|
| - test_server->document_root().LossyDisplayName()).c_str());
|
| + base::UTF16ToUTF8(test_server->document_root().LossyDisplayName())
|
| + .c_str());
|
| return -1;
|
| }
|
|
|
|
|