[Sync] Register USS types with ModelTypeRegistry before download

components/sync_driver/glue/sync_backend_registrar_unittest.cc

 // 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.
 
 #include "components/sync_driver/glue/sync_backend_registrar.h"
 
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "components/sync_driver/change_processor_mock.h"
@@ skipping 159 matching lines @@
     std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers;
     registrar_->GetWorkers(&workers);
     EXPECT_EQ(4u, workers.size());
   }
   ExpectRoutingInfo(registrar_.get(), syncer::ModelSafeRoutingInfo());
   ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
 }
 
 TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
   const ModelTypeSet initial_types(BOOKMARKS, NIGORI, PASSWORDS);
+  registrar_->RegisterNonBlockingType(BOOKMARKS);
   registrar_->SetInitialTypes(initial_types);
   EXPECT_TRUE(registrar_->IsNigoriEnabled());
   {
     std::vector<scoped_refptr<syncer::ModelSafeWorker> > workers;
     registrar_->GetWorkers(&workers);
     EXPECT_EQ(4u, workers.size());
   }
   {
     syncer::ModelSafeRoutingInfo expected_routing_info;
-    expected_routing_info[BOOKMARKS] = syncer::GROUP_PASSIVE;
+    expected_routing_info[BOOKMARKS] = syncer::GROUP_NON_BLOCKING;
     expected_routing_info[NIGORI] = syncer::GROUP_PASSIVE;
     // Passwords dropped because of no password store.
     ExpectRoutingInfo(registrar_.get(), expected_routing_info);
   }
   ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
 }
 
 TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
+  registrar_->RegisterNonBlockingType(BOOKMARKS);
   registrar_->SetInitialTypes(ModelTypeSet());
 
   // Add.
   const ModelTypeSet types1(BOOKMARKS, NIGORI, AUTOFILL);
   EXPECT_TRUE(
       registrar_->ConfigureDataTypes(types1, ModelTypeSet()).Equals(types1));
   {
     syncer::ModelSafeRoutingInfo expected_routing_info;
-    expected_routing_info[BOOKMARKS] = syncer::GROUP_PASSIVE;
+    expected_routing_info[BOOKMARKS] = syncer::GROUP_NON_BLOCKING;
     expected_routing_info[NIGORI] = syncer::GROUP_PASSIVE;
     expected_routing_info[AUTOFILL] = syncer::GROUP_PASSIVE;
     ExpectRoutingInfo(registrar_.get(), expected_routing_info);
   }
   ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
   EXPECT_TRUE(types1.Equals(registrar_->GetLastConfiguredTypes()));
 
   // Add and remove.
   const ModelTypeSet types2(PREFERENCES, THEMES);
   EXPECT_TRUE(registrar_->ConfigureDataTypes(types2, types1).Equals(types2));
@@ skipping 210 matching lines @@
   db_thread_lock_.Release();
 
   // Run the main thread loop until all workers have been removed and the
   // registrar destroyed.
   run_loop_.Run();
 }
 
 }  // namespace
 
 }  // namespace browser_sync