diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 20:36:30 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 20:36:30 +0000 |
| commit | 49554f0311d696155188b34e890ef2dca0a07414 (patch) | |
| tree | 9fb3796c58f6d6a256a3639b7118a91ef2f968c8 /jingle/notifier/base | |
| parent | e18a19b149d4a88701a45873307e03d866a01565 (diff) | |
| download | chromium_src-49554f0311d696155188b34e890ef2dca0a07414.zip chromium_src-49554f0311d696155188b34e890ef2dca0a07414.tar.gz chromium_src-49554f0311d696155188b34e890ef2dca0a07414.tar.bz2 | |
Revert 62699 - [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.
Reason for revert: Broke sync_integration_tests.
BUG=None
TEST=Manual
Review URL: http://codereview.chromium.org/3766004
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/3906001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/base')
| -rw-r--r-- | jingle/notifier/base/notifier_options.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/jingle/notifier/base/notifier_options.h b/jingle/notifier/base/notifier_options.h index a7a8d25..289b7d8 100644 --- a/jingle/notifier/base/notifier_options.h +++ b/jingle/notifier/base/notifier_options.h @@ -12,17 +12,19 @@ namespace notifier { struct NotifierOptions { NotifierOptions() - : allow_insecure_connection(false), - invalidate_xmpp_login(false), + : try_ssltcp_first(false), notification_method(kDefaultNotificationMethod) {} - // Indicates that insecure connections (e.g., plain authentication, - // no TLS) are allowed. Only used for testing. - bool allow_insecure_connection; + NotifierOptions(const bool try_ssltcp_first, + const net::HostPortPair& xmpp_host_port, + NotificationMethod notification_method) + : try_ssltcp_first(try_ssltcp_first), + xmpp_host_port(xmpp_host_port), + notification_method(notification_method) {} - // Indicates that the login info passed to XMPP is invalidated so - // that login fails. - bool invalidate_xmpp_login; + // Indicates that the SSLTCP port (443) is to be tried before the the XMPP + // port (5222) during login. + bool try_ssltcp_first; // Contains a custom URL and port for the notification server, if one is to // be used. Empty otherwise. |