sync: Introduce control data types

chrome/browser/sync/glue/sync_backend_registrar_unittest.cc

Index: chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
index 72158cbca8112f8dde5db5610429e9ed8e0c5778..f97ec19334dee68cee7621a31676bcbd797916cc 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
@@ -80,7 +80,7 @@ TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) {
   {
     std::vector<syncer::ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
-    EXPECT_EQ(4u, workers.size());
+    EXPECT_EQ(5u, workers.size());
   }
   ExpectRoutingInfo(&registrar, syncer::ModelSafeRoutingInfo());
   ExpectHasProcessorsForTypes(registrar, ModelTypeSet());
@@ -97,12 +97,12 @@ TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
   {
     std::vector<syncer::ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
-    EXPECT_EQ(4u, workers.size());
+    EXPECT_EQ(5u, workers.size());
   }
   {
     syncer::ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = syncer::GROUP_PASSIVE;
-    expected_routing_info[NIGORI] = syncer::GROUP_PASSIVE;
+    expected_routing_info[NIGORI] = syncer::GROUP_CONTROL;
     // Passwords dropped because of no password store.
     ExpectRoutingInfo(&registrar, expected_routing_info);
   }
@@ -123,8 +123,8 @@ TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
   {
     syncer::ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = syncer::GROUP_PASSIVE;
-    expected_routing_info[NIGORI] = syncer::GROUP_PASSIVE;
     expected_routing_info[AUTOFILL] = syncer::GROUP_PASSIVE;
+    expected_routing_info[NIGORI] = syncer::GROUP_CONTROL;
     ExpectRoutingInfo(&registrar, expected_routing_info);
   }
   ExpectHasProcessorsForTypes(registrar, ModelTypeSet());