[Sync] Register USS types with ModelTypeRegistry before download

sync/sessions/model_type_registry.cc

 // Copyright 2014 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 "sync/sessions/model_type_registry.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 68 matching lines @@
     size_t result2 = commit_contributor_map_.erase(it.Get());
     DCHECK_EQ(1U, result1);
     DCHECK_EQ(1U, result2);
   }
 
   // Clear the old instances of directory update handlers and commit
   // contributors, deleting their contents in the processs.
   directory_update_handlers_.clear();
   directory_commit_contributors_.clear();
 
+  enabled_directory_types_.Clear();
+
   // Create new ones and add them to the appropriate containers.
   for (ModelSafeRoutingInfo::const_iterator routing_iter = routing_info.begin();
        routing_iter != routing_info.end(); ++routing_iter) {
     ModelType type = routing_iter->first;
     ModelSafeGroup group = routing_iter->second;
+    if (group == GROUP_NON_BLOCKING)
+      continue;
     std::map<ModelSafeGroup, scoped_refptr<ModelSafeWorker> >::iterator
         worker_it = workers_map_.find(group);
     DCHECK(worker_it != workers_map_.end());
     scoped_refptr<ModelSafeWorker> worker = worker_it->second;
 
     // DebugInfoEmitters are never deleted.  Use existing one if we have it.
     DirectoryTypeDebugInfoEmitter* emitter = NULL;
     DirectoryTypeDebugInfoEmitterMap::iterator it =
         directory_type_debug_info_emitter_map_.find(type);
     if (it != directory_type_debug_info_emitter_map_.end()) {
@@ skipping 15 matching lines @@
     directory_commit_contributors_.push_back(committer);
     directory_update_handlers_.push_back(updater);
 
     bool inserted1 =
         update_handler_map_.insert(std::make_pair(type, updater)).second;
     DCHECK(inserted1) << "Attempt to override existing type handler in map";
 
     bool inserted2 =
         commit_contributor_map_.insert(std::make_pair(type, committer)).second;
     DCHECK(inserted2) << "Attempt to override existing type handler in map";
+    enabled_directory_types_.Put(type);
   }
 
-  enabled_directory_types_ = GetRoutingInfoTypes(routing_info);
   DCHECK(Intersection(GetEnabledDirectoryTypes(),
                       GetEnabledNonBlockingTypes()).Empty());
 }
 
 void ModelTypeRegistry::ConnectSyncTypeToWorker(
     ModelType type,
     scoped_ptr<syncer_v2::ActivationContext> activation_context) {
   DVLOG(1) << "Enabling an off-thread sync type: " << ModelTypeToString(type);
 
   // Initialize Worker -> Processor communication channel.
@@ skipping 142 matching lines @@
            model_type_workers_.begin();
        it != model_type_workers_.end(); ++it) {
     if (encrypted_types_.Has((*it)->GetModelType())) {
       (*it)->UpdateCryptographer(
           make_scoped_ptr(new Cryptographer(*cryptographer_)));
     }
   }
 }
 
 ModelTypeSet ModelTypeRegistry::GetEnabledNonBlockingTypes() const {
-  ModelTypeSet enabled_off_thread_types;
+  ModelTypeSet enabled_non_blocking_types;
   for (ScopedVector<syncer_v2::ModelTypeWorker>::const_iterator it =
            model_type_workers_.begin();
        it != model_type_workers_.end(); ++it) {
-    enabled_off_thread_types.Put((*it)->GetModelType());
+    enabled_non_blocking_types.Put((*it)->GetModelType());
   }
-  return enabled_off_thread_types;
+  return enabled_non_blocking_types;
 }
 
 }  // namespace syncer