Index: sync/internal_api/sync_manager_impl.cc |
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc |
index 6a164d8f0ff2aac4ff56893cfc13914c323e1737..eac7e49424785dea21901a6f2e41593c1fee684f 100644 |
--- a/sync/internal_api/sync_manager_impl.cc |
+++ b/sync/internal_api/sync_manager_impl.cc |
@@ -369,7 +369,6 @@ bool SyncManagerImpl::Init( |
bool use_ssl, |
const scoped_refptr<base::TaskRunner>& blocking_task_runner, |
scoped_ptr<HttpPostProviderFactory> post_factory, |
- const ModelSafeRoutingInfo& model_safe_routing_info, |
const std::vector<ModelSafeWorker*>& workers, |
ExtensionsActivityMonitor* extensions_activity_monitor, |
SyncManager::ChangeDelegate* change_delegate, |
@@ -425,6 +424,8 @@ bool SyncManagerImpl::Init( |
connection_manager_->AddListener(this); |
+ bool success = SignIn(credentials); |
+ |
// Build a SyncSessionContext and store the worker in it. |
DVLOG(1) << "Sync is bringing up SyncSessionContext."; |
std::vector<SyncEngineEventListener*> listeners; |
@@ -433,7 +434,6 @@ bool SyncManagerImpl::Init( |
session_context_ = internal_components_factory->BuildContext( |
connection_manager_.get(), |
directory(), |
- model_safe_routing_info, |
workers, |
extensions_activity_monitor, |
&throttled_data_type_tracker_, |
@@ -444,8 +444,6 @@ bool SyncManagerImpl::Init( |
scheduler_ = internal_components_factory->BuildScheduler( |
name_, session_context_.get()).Pass(); |
- bool success = SignIn(credentials); |
- |
if (success) { |
scheduler_->Start(SyncScheduler::CONFIGURATION_MODE); |
@@ -482,7 +480,8 @@ bool SyncManagerImpl::Init( |
FOR_EACH_OBSERVER(SyncManager::Observer, observers_, |
OnInitializationComplete( |
MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()), |
- success)); |
+ success, success ? InitialSyncEndedTypes() |
+ : syncer::ModelTypeSet())); |
if (!success) |
return false; |