diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 03:27:19 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 03:27:19 +0000 |
| commit | 23ca8ddccca74556f3e56404c2bd7c53b9df16dd (patch) | |
| tree | 1c63dbc7e08c96342500f9a5603ab7ca51ddbe63 /chrome/browser/sync/engine/syncapi.cc | |
| parent | f698a7f22b36d056bbbfa74aaf910d8ac3b97c23 (diff) | |
| download | chromium_src-23ca8ddccca74556f3e56404c2bd7c53b9df16dd.zip chromium_src-23ca8ddccca74556f3e56404c2bd7c53b9df16dd.tar.gz chromium_src-23ca8ddccca74556f3e56404c2bd7c53b9df16dd.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).
Removed obsolete --use-ssl-tcp switch.
BUG=None
TEST=Manual
Review URL: http://codereview.chromium.org/3766004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncapi.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 67bccec..0c8b706 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1497,11 +1497,16 @@ void SyncManager::SyncInternal::InitializeTalkMediator() { new sync_notifier::ServerNotifierThread( notifier_options_, state, this); talk_mediator_.reset( - new TalkMediatorImpl(server_notifier_thread, false)); + new TalkMediatorImpl(server_notifier_thread, + notifier_options_.invalidate_xmpp_login, + notifier_options_.allow_insecure_connection)); } else { notifier::MediatorThread* mediator_thread = new notifier::MediatorThreadImpl(notifier_options_); - talk_mediator_.reset(new TalkMediatorImpl(mediator_thread, false)); + talk_mediator_.reset( + new TalkMediatorImpl(mediator_thread, + notifier_options_.invalidate_xmpp_login, + notifier_options_.allow_insecure_connection)); if (notifier_options_.notification_method != notifier::NOTIFICATION_LEGACY) { if (notifier_options_.notification_method == |