diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 03:01:54 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 03:01:54 +0000 |
| commit | 39e8c48020b4b985e9314838ca1270410e328b61 (patch) | |
| tree | 4560bfd3643832e90e8173f46ee3624df428c441 /chrome/browser/sync | |
| parent | c56428f24b67efa6a2eff77a709b7b6489403617 (diff) | |
| download | chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.zip chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.tar.gz chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.tar.bz2 | |
Combined both constructors of TalkMediatorImpl into one.
BUG=none
TEST=manual, trybots
Review URL: http://codereview.chromium.org/2835003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 452e584..7414332 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -52,6 +52,7 @@ #include "chrome/common/deprecated/event_sys.h" #include "chrome/common/net/gaia/gaia_authenticator.h" #include "chrome/common/net/network_change_notifier_proxy.h" +#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" #include "chrome/common/net/notifier/listener/notification_constants.h" #include "chrome/common/net/notifier/listener/talk_mediator.h" #include "chrome/common/net/notifier/listener/talk_mediator_impl.h" @@ -1250,8 +1251,11 @@ bool SyncManager::SyncInternal::Init( // jank if we try to shut down sync. Fix this. connection_manager()->CheckServerReachable(); + const bool kInitializeSsl = true; + const bool kConnectImmediately = false; talk_mediator_.reset(new TalkMediatorImpl( - network_change_notifier_thread, invalidate_xmpp_auth_token)); + new notifier::MediatorThreadImpl(network_change_notifier_thread), + kInitializeSsl, kConnectImmediately, invalidate_xmpp_auth_token)); if (notification_method != browser_sync::NOTIFICATION_LEGACY) { if (notification_method == browser_sync::NOTIFICATION_TRANSITIONAL) { talk_mediator_->AddSubscribedServiceUrl( |