sync: Process 'control' data separately

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 e456901d0e947f12b1d04715eca7efa17a1af182..e052998be1bd31671d4aefcb1a253c9d66791206 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
@@ -79,7 +79,7 @@ TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) {
   {
     std::vector<csync::ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
-    EXPECT_EQ(4u, workers.size());
+    EXPECT_EQ(5u, workers.size());
   }
   ExpectRoutingInfo(&registrar, csync::ModelSafeRoutingInfo());
   ExpectHasProcessorsForTypes(registrar, ModelTypeSet());
@@ -95,12 +95,12 @@ TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
   {
     std::vector<csync::ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
-    EXPECT_EQ(4u, workers.size());
+    EXPECT_EQ(5u, workers.size());
   }
   {
     csync::ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = csync::GROUP_PASSIVE;
-    expected_routing_info[NIGORI] = csync::GROUP_PASSIVE;
+    expected_routing_info[NIGORI] = csync::GROUP_CONTROL;
     // Passwords dropped because of no password store.
     ExpectRoutingInfo(&registrar, expected_routing_info);
   }
@@ -120,8 +120,8 @@ TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
   {
     csync::ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = csync::GROUP_PASSIVE;
-    expected_routing_info[NIGORI] = csync::GROUP_PASSIVE;
     expected_routing_info[AUTOFILL] = csync::GROUP_PASSIVE;
+    expected_routing_info[NIGORI] = csync::GROUP_CONTROL;
     ExpectRoutingInfo(&registrar, expected_routing_info);
   }
   ExpectHasProcessorsForTypes(registrar, ModelTypeSet());