Revert of [Sync] Make directory types registration explicit in ModelTypeRegistry

components/sync/tools/sync_client.cc

 // Copyright (c) 2012 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 <stdint.h>
 
 #include <cstddef>
 #include <cstdio>
 #include <memory>
 #include <string>
@@ skipping 360 matching lines @@
   model_types.Put(HISTORY_DELETE_DIRECTIVES);
   model_types.Put(SYNCED_NOTIFICATIONS);
   model_types.Put(SYNCED_NOTIFICATION_APP_INFO);
   model_types.Put(DEVICE_INFO);
   model_types.Put(EXPERIMENTS);
   model_types.Put(PRIORITY_PREFERENCES);
   model_types.Put(DICTIONARY);
   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;
   workers.push_back(passive_model_safe_worker);
 
   // Set up sync manager.
   SyncManagerFactory sync_manager_factory;
   std::unique_ptr<SyncManager> sync_manager =
       sync_manager_factory.CreateSyncManager("sync_client manager");
   LoggingJsEventHandler js_event_handler;
@@ skipping 40 matching lines @@
   args.cancelation_signal = &scm_cancelation_signal;
   sync_manager->Init(&args);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   invalidator->UpdateCredentials(credentials.email, credentials.sync_token);
   std::unique_ptr<InvalidatorShim> shim(
       new InvalidatorShim(sync_manager.get()));
   invalidator->RegisterHandler(shim.get());
   CHECK(invalidator->UpdateRegisteredIds(
       shim.get(), ModelTypeSetToObjectIdSet(model_types)));
-  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());
+  sync_manager->StartSyncingNormally(routing_info, base::Time());
 
   base::RunLoop().Run();
 
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }