summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 17:28:21 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 17:28:21 +0000
commite3688a2a3262b633d08837e336a0c41f28c72f37 (patch)
treea15bb77432383bd8b7631efa8bafa5abe67d0f02 /chrome/test
parente3f589a8ff35b87a387f17bf002cb81041c45a43 (diff)
downloadchromium_src-e3688a2a3262b633d08837e336a0c41f28c72f37.zip
chromium_src-e3688a2a3262b633d08837e336a0c41f28c72f37.tar.gz
chromium_src-e3688a2a3262b633d08837e336a0c41f28c72f37.tar.bz2
[Sync] Added some switches for testing/debugging.
Added back in --sync-invalidate-xmpp-login (now, not only in debug mode!). Added --sync-allow-insecure-xmpp-connection, which enables sync to connect to insecure XMPP servers (e.g., a local one). Changed --use-ssl-tcp to --sync-try-ssltcp-first-for-xmpp. BUG=None TEST=Manual Review URL: http://codereview.chromium.org/4158001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/live_sync/live_sync_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index f73c2d1..07a94d4 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -114,8 +114,8 @@ void LiveSyncTest::SetUp() {
// 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);
+ if (!cl->HasSwitch(switches::kSyncTrySsltcpFirstForXmpp)) {
+ cl->AppendSwitch(switches::kSyncTrySsltcpFirstForXmpp);
}
// Mock the Mac Keychain service. The real Keychain can block on user input.