| Index: components/sync/driver/glue/sync_backend_host_impl.cc
|
| diff --git a/components/sync/driver/glue/sync_backend_host_impl.cc b/components/sync/driver/glue/sync_backend_host_impl.cc
|
| index b125c4482823f753def6fe15a43af09cb18650f1..f9f6462a6189fc6f00af6a2418d48101d7d9593c 100644
|
| --- a/components/sync/driver/glue/sync_backend_host_impl.cc
|
| +++ b/components/sync/driver/glue/sync_backend_host_impl.cc
|
| @@ -184,9 +184,7 @@ void SyncBackendHostImpl::Shutdown(ShutdownReason reason) {
|
| DCHECK(!host_);
|
|
|
| if (invalidation_handler_registered_) {
|
| - if (reason == DISABLE_SYNC) {
|
| - UnregisterInvalidationIds();
|
| - }
|
| + CHECK(invalidator_->UpdateRegisteredInvalidationIds(this, ObjectIdSet()));
|
| invalidator_->UnregisterInvalidationHandler(this);
|
| invalidator_ = nullptr;
|
| }
|
| @@ -203,12 +201,6 @@ void SyncBackendHostImpl::Shutdown(ShutdownReason reason) {
|
| registrar_ = nullptr;
|
| }
|
|
|
| -void SyncBackendHostImpl::UnregisterInvalidationIds() {
|
| - if (invalidation_handler_registered_) {
|
| - CHECK(invalidator_->UpdateRegisteredInvalidationIds(this, ObjectIdSet()));
|
| - }
|
| -}
|
| -
|
| ModelTypeSet SyncBackendHostImpl::ConfigureDataTypes(
|
| ConfigureReason reason,
|
| const DataTypeConfigStateMap& config_state_map,
|
|
|