Index: chrome/browser/sync/glue/sync_backend_host.cc |
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc |
index 9230c2cd9e1eff6d32d79c315f49e7434e10812f..5d7a88249ea0d5ba747f9a04fd23507b67dd0e87 100644 |
--- a/chrome/browser/sync/glue/sync_backend_host.cc |
+++ b/chrome/browser/sync/glue/sync_backend_host.cc |
@@ -111,6 +111,14 @@ void SyncBackendHost::Initialize( |
profile_->GetHistoryService(Profile::IMPLICIT_ACCESS)); |
} |
+ // Any datatypes that we want the syncer to pull down must |
+ // be in the routing_info map. We set them to group passive, meaning that |
+ // updates will be applied, but not dispatched to the UI thread yet. |
+ for (syncable::ModelTypeSet::const_iterator it = types.begin(); |
+ it != types.end(); ++it) { |
+ registrar_.routing_info[(*it)] = GROUP_PASSIVE; |
+ } |
+ |
PasswordStore* password_store = |
profile_->GetPasswordStore(Profile::IMPLICIT_ACCESS); |
if (password_store) { |
@@ -118,14 +126,7 @@ void SyncBackendHost::Initialize( |
new PasswordModelWorker(password_store); |
} else { |
LOG(WARNING) << "Password store not initialized, cannot sync passwords"; |
- } |
- |
- // Any datatypes that we want the syncer to pull down must |
- // be in the routing_info map. We set them to group passive, meaning that |
- // updates will be applied, but not dispatched to the UI thread yet. |
- for (syncable::ModelTypeSet::const_iterator it = types.begin(); |
- it != types.end(); ++it) { |
- registrar_.routing_info[(*it)] = GROUP_PASSIVE; |
+ registrar_.routing_info.remove(syncable::PASSWORDS); |
tim (not reviewing)
2011/02/03 21:10:29
You want .erase I think.
Nicolas Zea
2011/02/03 22:53:56
Done.
|
} |
// TODO(tim): Remove this special case once NIGORI is populated by |