[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..dfe2f9547745b1247751d35b5c0af8fefe138f60 100644
--- a/components/sync/engine_impl/syncer.cc
+++ b/components/sync/engine_impl/syncer.cc
@@ -83,12 +83,13 @@ bool Syncer::ConfigureSyncShare(
   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());

[skym, 2017/04/06 22:27:45]

What do you think of moving this to
https://cs.chromium.org/chromium/src/components/sync/engine_impl/sync_schedul...

[pavely, 2017/04/06 23:48:25]

I thought about it when adding this check last time. I think these locations are
equivalent, but scheduler should be concerned with "when" cycle happens, pass
parameters through and let syncer decide "what" to do.

 
   GetUpdatesProcessor get_updates_processor(
       cycle->context()->model_type_registry()->update_handler_map(),