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

components/sync/engine_impl/sync_scheduler.h

 // Copyright 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.
 
 #ifndef COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_H_
 #define COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "components/sync/base/invalidation_interface.h"
 #include "components/sync/engine_impl/cycle/sync_cycle.h"
 #include "components/sync/engine_impl/nudge_source.h"
 
 namespace tracked_objects {
 class Location;
 }  // namespace tracked_objects
 
 namespace syncer {
 
 struct ConfigurationParams {
   ConfigurationParams();
   ConfigurationParams(
       const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& source,
       ModelTypeSet types_to_download,
+      const ModelSafeRoutingInfo& routing_info,
       const base::Closure& ready_task,
       const base::Closure& retry_task);
   ConfigurationParams(const ConfigurationParams& other);
   ~ConfigurationParams();
 
   // Source for the configuration.
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source;
   // The types that should be downloaded.
   ModelTypeSet types_to_download;
+  // The new routing info (superset of types to be downloaded).
+  ModelSafeRoutingInfo routing_info;
   // Callback to invoke on configuration completion.
   base::Closure ready_task;
   // Callback to invoke on configuration failure.
   base::Closure retry_task;
 };
 
 struct ClearParams {
   explicit ClearParams(const base::Closure& report_success_task);
   ClearParams(const ClearParams& other);
   ~ClearParams();
@@ skipping 96 matching lines @@
   // Called when credentials are updated by the user.
   virtual void OnCredentialsUpdated() = 0;
 
   // Called when the network layer detects a connection status change.
   virtual void OnConnectionStatusChange() = 0;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_SYNC_SCHEDULER_H_