diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 22:27:24 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 22:27:24 +0000 |
| commit | 3d613993d6ec118f49eb07b6b30901ca848cd5f8 (patch) | |
| tree | de0cc37500838553663e9e1ffed4887b610d1197 /chrome/browser/sync | |
| parent | 761315b2355f5d9a31e1ac73966f5c083f8de09a (diff) | |
| download | chromium_src-3d613993d6ec118f49eb07b6b30901ca848cd5f8.zip chromium_src-3d613993d6ec118f49eb07b6b30901ca848cd5f8.tar.gz chromium_src-3d613993d6ec118f49eb07b6b30901ca848cd5f8.tar.bz2 | |
Removed TalkMediator SSL initialization.
Since we're now using chrome sockets, we don't need this code.
BUG=54146
TEST=Unit tests
Review URL: http://codereview.chromium.org/3411012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index f392941..cd2d92d 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1310,10 +1310,7 @@ bool SyncManager::SyncInternal::Init( (notifier_options_.notification_method == notifier::NOTIFICATION_SERVER) ? new sync_notifier::ServerNotifierThread(notifier_options) : new notifier::MediatorThreadImpl(notifier_options); - const bool kInitializeSsl = true; - const bool kConnectImmediately = false; - talk_mediator_.reset(new TalkMediatorImpl(mediator_thread, kInitializeSsl, - kConnectImmediately, false)); + talk_mediator_.reset(new TalkMediatorImpl(mediator_thread, false)); if (notifier_options_.notification_method != notifier::NOTIFICATION_LEGACY && notifier_options_.notification_method != notifier::NOTIFICATION_SERVER) { if (notifier_options_.notification_method == |