sync: Introduce control data types

chrome/browser/sync/glue/sync_backend_host.cc

Index: chrome/browser/sync/glue/sync_backend_host.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index f33bff57ba289bc134e3ce09944c450964c1336f..c950956e796800a931031cf42c375de97685e321 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -76,6 +76,13 @@ using syncer::SyncCredentials;
 
 #define SDVLOG(verbose_level) DVLOG(verbose_level) << name_ << ": "
 
+// static
+syncer::ModelTypeSet SyncBackendHost::EarlyDownloadTypes() {
+  syncer::ModelTypeSet set;
+  set.Put(syncer::NIGORI);
+  return set;
+}
+
 class SyncBackendHost::Core
     : public base::RefCountedThreadSafe<SyncBackendHost::Core>,
       public syncer::SyncEncryptionHandler::Observer,
@@ -1348,7 +1355,7 @@ void SyncBackendHost::HandleInitializationCompletedOnFrontendLoop(
       initialization_state_ = DOWNLOADING_NIGORI;
       ConfigureDataTypes(
           syncer::CONFIGURE_REASON_NEW_CLIENT,
-          syncer::ModelTypeSet(syncer::NIGORI),
+          syncer::ModelTypeSet(EarlyDownloadTypes()),
           syncer::ModelTypeSet(),
           // Calls back into this function.
           base::Bind(