summaryrefslogtreecommitdiffstats
path: root/chrome/service/cloud_print
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 20:36:30 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 20:36:30 +0000
commit49554f0311d696155188b34e890ef2dca0a07414 (patch)
tree9fb3796c58f6d6a256a3639b7118a91ef2f968c8 /chrome/service/cloud_print
parente18a19b149d4a88701a45873307e03d866a01565 (diff)
downloadchromium_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 'chrome/service/cloud_print')
-rw-r--r--chrome/service/cloud_print/cloud_print_proxy_backend.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index 33c1a55..2d0a46f 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -321,12 +321,10 @@ void CloudPrintProxyBackend::Core::DoInitializeWithToken(
const notifier::NotifierOptions kNotifierOptions;
const bool kInvalidateXmppAuthToken = false;
- const bool kAllowInsecureXmppConnection = false;
talk_mediator_.reset(new notifier::TalkMediatorImpl(
new notifier::PushNotificationsThread(kNotifierOptions,
kCloudPrintPushNotificationsSource),
- kInvalidateXmppAuthToken,
- kAllowInsecureXmppConnection));
+ kInvalidateXmppAuthToken));
push_notifications_channel_ = kCloudPrintPushNotificationsSource;
push_notifications_channel_.append("/proxy/");
push_notifications_channel_.append(proxy_id);