[Sync] Restrict types to configure to only include registered types

components/sync/engine_impl/syncer.cc

Index: components/sync/engine_impl/syncer.cc
diff --git a/components/sync/engine_impl/syncer.cc b/components/sync/engine_impl/syncer.cc
index 5d28f4a9dcebc48b5dc6a3418b95eba64f9cf396..6d8d71e954db5c6601d8a9ced6b032685b1ae4d3 100644
--- a/components/sync/engine_impl/syncer.cc
+++ b/components/sync/engine_impl/syncer.cc
@@ -79,16 +79,17 @@ bool Syncer::ConfigureSyncShare(
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
     SyncCycle* cycle) {
   base::AutoReset<bool> is_syncing(&is_syncing_, true);
-  VLOG(1) << "Configuring types " << ModelTypeSetToString(request_types);
-  HandleCycleBegin(cycle);
-  ConfigureGetUpdatesDelegate configure_delegate(source);
 
-  // It is possible during shutdown that datatypes get unregistered from
+  // It is possible during configuration that datatypes get unregistered from
   // ModelTypeRegistry before scheduled configure sync cycle gets executed.
-  // When it happens we should adjust set of types to download to only include
+  // This happens either because DataTypeController::LoadModels fail and type
+  // need to be stopped or during shutdown when all datatypes are stopped. When
+  // it happens we should adjust set of types to download to only include
   // registered types.
-  if (cancelation_signal_->IsSignalled())
-    request_types.RetainAll(cycle->context()->GetEnabledTypes());
+  request_types.RetainAll(cycle->context()->GetEnabledTypes());
+  VLOG(1) << "Configuring types " << ModelTypeSetToString(request_types);
+  HandleCycleBegin(cycle);
+  ConfigureGetUpdatesDelegate configure_delegate(source);
 
   GetUpdatesProcessor get_updates_processor(
       cycle->context()->model_type_registry()->update_handler_map(),