diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 23:43:00 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 23:43:00 +0000 |
| commit | ede55690571ef8494b0811ea402d4441fd62edcf (patch) | |
| tree | d2ceb920de3bd49faefaf336165a2d7f814d6414 /chrome/browser | |
| parent | 5a523da5ed3527f4d933e1dfe13e4801d76ca9f7 (diff) | |
| download | chromium_src-ede55690571ef8494b0811ea402d4441fd62edcf.zip chromium_src-ede55690571ef8494b0811ea402d4441fd62edcf.tar.gz chromium_src-ede55690571ef8494b0811ea402d4441fd62edcf.tar.bz2 | |
Remove NIGORI from the sync routing info.
BUG=47766
TEST=unittest
Review URL: http://codereview.chromium.org/2883015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index f5659e0..d9bfae3 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1028,7 +1028,6 @@ class SyncManager::SyncInternal ModelSafeRoutingInfo enabled_types; registrar_->GetModelSafeRoutingInfo(&enabled_types); - DCHECK(!enabled_types.empty()); for (ModelSafeRoutingInfo::const_iterator i = enabled_types.begin(); i != enabled_types.end(); ++i) { if (!lookup->initial_sync_ended_for_type(i->first)) diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index e8c1b1c..e4f681c1 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -99,7 +99,6 @@ void SyncBackendHost::Initialize( it != types.end(); ++it) { registrar_.routing_info[(*it)] = GROUP_PASSIVE; } - registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE; core_thread_.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(core_.get(), &SyncBackendHost::Core::DoInitialize, |