[sync] Add --port and --xmpp-port parameters to run_testserver.cc

net/tools/testserver/run_testserver.cc

Index: net/tools/testserver/run_testserver.cc
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index f00f9f2d2b5730d59886b047c36f49a983ce55d5..45d6bb909abad3d18c74d0d53bf5ef69997b9bb1 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/test/test_timeouts.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "net/test/python_utils.h"
 #include "net/test/test_server.h"
@@ -77,16 +78,25 @@ int main(int argc, const char* argv[]) {
   }
 
   net::TestServer::Type server_type(net::TestServer::TYPE_HTTP);
+  std::string xmpp_port_str = "0";
   if (command_line->HasSwitch("https")) {
     server_type = net::TestServer::TYPE_HTTPS;
   } else if (command_line->HasSwitch("ftp")) {
     server_type = net::TestServer::TYPE_FTP;
   } else if (command_line->HasSwitch("sync")) {
     server_type = net::TestServer::TYPE_SYNC;
+    if (command_line->HasSwitch("xmpp-port")) {
+      xmpp_port_str = command_line->GetSwitchValueASCII("xmpp-port");
+    }
   } else if (command_line->HasSwitch("sync-test")) {
     return RunSyncTest() ? 0 : -1;
   }
 
+  std::string port_str = "0";
+  if (command_line->HasSwitch("port")) {
+    port_str = command_line->GetSwitchValueASCII("port");
+  }
+
   net::TestServer::HTTPSOptions https_options;
   if (command_line->HasSwitch("https-cert")) {
     server_type = net::TestServer::TYPE_HTTPS;
@@ -114,12 +124,25 @@ int main(int argc, const char* argv[]) {
   }
 
   scoped_ptr<net::TestServer> test_server;
-  if (server_type == net::TestServer::TYPE_HTTPS)
+  if (server_type == net::TestServer::TYPE_HTTPS) {
     test_server.reset(new net::TestServer(https_options, doc_root));
-  else
+  } else {
     test_server.reset(new net::TestServer(server_type,
                                           net::TestServer::kLocalhost,
                                           doc_root));
+  }
+
+  if (port_str != "0") {
+    int port_int = 0;
+    base::StringToInt(port_str, &port_int);
+    test_server->SetPort((uint16) port_int);
+  }
+
+  if (server_type == net::TestServer::TYPE_SYNC && xmpp_port_str != "0") {
+    int xmpp_port_int = 0;
+    base::StringToInt(xmpp_port_str, &xmpp_port_int);
+    test_server->SetXmppPort((uint16) xmpp_port_int);
+  }
 
   if (!test_server->Start()) {
     printf("Error: failed to start test server. Exiting.\n");