sync: Process 'control' data separately

chrome/browser/sync/glue/sync_backend_registrar_unittest.cc

 // Copyright (c) 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 "chrome/browser/sync/glue/sync_backend_registrar.h"
 
 #include "chrome/browser/sync/glue/change_processor_mock.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 61 matching lines @@
   content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) {
   TestingProfile profile;
   SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
   EXPECT_FALSE(registrar.IsNigoriEnabled());
   {
     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());
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
   TestingProfile profile;
   const ModelTypeSet initial_types(BOOKMARKS, NIGORI, PASSWORDS);
   SyncBackendRegistrar registrar(initial_types, "test", &profile, &loop_);
   EXPECT_TRUE(registrar.IsNigoriEnabled());
   {
     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);
   }
   ExpectHasProcessorsForTypes(registrar, ModelTypeSet());
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
   TestingProfile profile;
   SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
 
   // Add.
   const ModelTypeSet types1(BOOKMARKS, NIGORI, AUTOFILL);
   EXPECT_TRUE(
       registrar.ConfigureDataTypes(types1, ModelTypeSet()).Equals(types1));
   {
     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());
 
   // Add and remove.
   const ModelTypeSet types2(PREFERENCES, THEMES);
   EXPECT_TRUE(registrar.ConfigureDataTypes(types2, types1).Equals(types2));
   {
     csync::ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[PREFERENCES] = csync::GROUP_PASSIVE;
@@ skipping 106 matching lines @@
   // Should do nothing.
   TriggerChanges(&registrar, AUTOFILL);
 
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 }  // namespace
 
 }  // namespace browser_sync