[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

1 files changed, 13 insertions, 1 deletions

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index f8a7e57..9a6ea99 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -280,10 +280,22 @@ void ProfileSyncService::InitSettings() {
   }
 
   notifier_options_.try_ssltcp_first =
-      command_line.HasSwitch(switches::kSyncUseSslTcp);
+      command_line.HasSwitch(switches::kSyncTrySsltcpFirstForXmpp);
   if (notifier_options_.try_ssltcp_first)
     VLOG(1) << "Trying SSL/TCP port before XMPP port for notifications.";
 
+  notifier_options_.invalidate_xmpp_login =
+      command_line.HasSwitch(switches::kSyncInvalidateXmppLogin);
+  if (notifier_options_.invalidate_xmpp_login) {
+    VLOG(1) << "Invalidating sync XMPP login.";
+  }
+
+  notifier_options_.allow_insecure_connection =
+      command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
+  if (notifier_options_.allow_insecure_connection) {
+    VLOG(1) << "Allowing insecure XMPP connections.";
+  }
+
   if (command_line.HasSwitch(switches::kSyncNotificationMethod)) {
     const std::string notification_method_str(
         command_line.GetSwitchValueASCII(switches::kSyncNotificationMethod));