[Sync] Make directory types registration explicit in ModelTypeRegistry

components/sync/tools/sync_client.cc

Index: components/sync/tools/sync_client.cc
diff --git a/components/sync/tools/sync_client.cc b/components/sync/tools/sync_client.cc
index 69954bca77b5c59e113ce9f4b7da26a9cf52c4b1..2056aea1db9ea043ea9643189c1ce19b3deb50d9 100644
--- a/components/sync/tools/sync_client.cc
+++ b/components/sync/tools/sync_client.cc
@@ -378,10 +378,6 @@ int SyncClientMain(int argc, char* argv[]) {
   model_types.Put(FAVICON_IMAGES);
   model_types.Put(FAVICON_TRACKING);
 
-  ModelSafeRoutingInfo routing_info;
-  for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
-    routing_info[it.Get()] = GROUP_PASSIVE;
-  }
   scoped_refptr<PassiveModelWorker> passive_model_safe_worker =
       new PassiveModelWorker();
   std::vector<scoped_refptr<ModelSafeWorker>> workers;
@@ -442,7 +438,13 @@ int SyncClientMain(int argc, char* argv[]) {
   invalidator->RegisterHandler(shim.get());
   CHECK(invalidator->UpdateRegisteredIds(
       shim.get(), ModelTypeSetToObjectIdSet(model_types)));
-  sync_manager->StartSyncingNormally(routing_info, base::Time());
+  ModelTypeConnector* model_type_connector =
+      sync_manager->GetModelTypeConnector();
+  for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
+    model_type_connector->RegisterDirectoryType(it.Get(), GROUP_PASSIVE);
+  }
+
+  sync_manager->StartSyncingNormally(base::Time());
 
   base::RunLoop().Run();