Use SSL/TCP port for notifications in sync tests.

The sync integration tests start off by using the XMPP port (5222) to connect to the sync notification server. Since this port is blocked on the chromium builders, the tests wait for upto a minute before they failover to the SSL/TCP port (443), by which time the tests time out and fail.

This checkin adds a switch that, when enabled, causes the tests to try the SSL/TCP port before the XMPP port.

BUG=50595
TEST=sync_integration_tests

Review URL: http://codereview.chromium.org/3050036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55599 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 8f87da3..a43ac60 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -64,6 +64,15 @@ void LiveSyncTest::SetUp() {
                           "transitional");
   }
 
+  // The chrome sync builders are behind a firewall that blocks port 5222, the
+  // default port for XMPP notifications. This causes the tests to spend up to a
+  // minute waiting for a connection on port 5222 before they fail over to port
+  // 443, the default SSL/TCP port. This switch causes the tests to use port 443
+  // by default, without having to try port 5222.
+  if (!cl->HasSwitch(switches::kSyncUseSslTcp)) {
+    cl->AppendSwitch(switches::kSyncUseSslTcp);
+  }
+
   // Unless a sync server was explicitly provided, run a test one locally.
   // TODO(ncarter): It might be better to allow the user to specify a choice
   // of sync server "providers" -- a script that could locate (or allocate)