[Sync] Remove SyncEngine::UnregisterInvalidationIds

components/sync/driver/glue/sync_backend_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/driver/glue/sync_backend_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 166 matching lines @@
 
   core_->ShutdownOnUIThread();
 }
 
 void SyncBackendHostImpl::Shutdown(ShutdownReason reason) {
   // StopSyncingForShutdown() (which nulls out |host_|) should be
   // called first.
   DCHECK(!host_);
 
   if (invalidation_handler_registered_) {
-    if (reason == DISABLE_SYNC) {
-      UnregisterInvalidationIds();
-    }
+    CHECK(invalidator_->UpdateRegisteredInvalidationIds(this, ObjectIdSet()));
     invalidator_->UnregisterInvalidationHandler(this);
     invalidator_ = nullptr;
   }
   invalidation_handler_registered_ = false;
 
   model_type_connector_.reset();
 
   // Shut down and destroy SyncManager. SyncManager holds a pointer to
   // |registrar_| so its destruction must be sequenced before the destruction of
   // |registrar_|.
   sync_task_runner_->PostTask(
       FROM_HERE, base::Bind(&SyncBackendHostCore::DoShutdown, core_, reason));
   core_ = nullptr;
   registrar_ = nullptr;
 }
 
-void SyncBackendHostImpl::UnregisterInvalidationIds() {
-  if (invalidation_handler_registered_) {
-    CHECK(invalidator_->UpdateRegisteredInvalidationIds(this, ObjectIdSet()));
-  }
-}
-
 ModelTypeSet SyncBackendHostImpl::ConfigureDataTypes(
     ConfigureReason reason,
     const DataTypeConfigStateMap& config_state_map,
     const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task,
     const base::Callback<void()>& retry_callback) {
   // Only one configure is allowed at a time.  This is guaranteed by our
   // callers.  The SyncBackendHostImpl requests one configure as the backend is
   // initializing and waits for it to complete.  After initialization, all
   // configurations will pass through the DataTypeManager, which is careful to
   // never send a new configure request until the current request succeeds.
@@ skipping 473 matching lines @@
     const SyncManager::ClearServerDataCallback& frontend_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   frontend_callback.Run();
 }
 
 }  // namespace syncer
 
 #undef SDVLOG
 
 #undef SLOG