sync: Process 'control' data separately

sync/engine/sync_scheduler.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 "sync/engine/sync_scheduler.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/bind.h"
@@ skipping 532 matching lines @@
 }
 
 // Helper to extract the routing info and workers corresponding to types in
 // |types| from |current_routes| and |current_workers|.
 void GetModelSafeParamsForTypes(ModelTypeSet types,
     const ModelSafeRoutingInfo& current_routes,
     const std::vector<ModelSafeWorker*>& current_workers,
     ModelSafeRoutingInfo* result_routes,
     std::vector<ModelSafeWorker*>* result_workers) {
   bool passive_group_added = false;
+  bool control_group_added = false;
 
   typedef std::vector<ModelSafeWorker*>::const_iterator iter;
   for (ModelTypeSet::Iterator it = types.First();
        it.Good(); it.Inc()) {
     const syncable::ModelType t = it.Get();
     ModelSafeRoutingInfo::const_iterator route = current_routes.find(t);
     DCHECK(route != current_routes.end());
     ModelSafeGroup group = route->second;
 
     (*result_routes)[t] = group;
     iter w_tmp_it = std::find_if(current_workers.begin(), current_workers.end(),
                                  ModelSafeWorkerGroupIs(group));
     if (w_tmp_it != current_workers.end()) {
       iter result_workers_it = std::find_if(
           result_workers->begin(), result_workers->end(),
           ModelSafeWorkerGroupIs(group));
       if (result_workers_it == result_workers->end())
         result_workers->push_back(*w_tmp_it);
 
       if (group == GROUP_PASSIVE)
         passive_group_added = true;
+      if (group == GROUP_CONTROL)
+        control_group_added = true;
     } else {
         NOTREACHED();
     }
   }
 
   // Always add group passive.
   if (passive_group_added == false) {
     iter it = std::find_if(current_workers.begin(), current_workers.end(),
                            ModelSafeWorkerGroupIs(GROUP_PASSIVE));
     if (it != current_workers.end())
       result_workers->push_back(*it);
     else
       NOTREACHED();
   }
+  if (control_group_added == false) {
+    iter it = std::find_if(current_workers.begin(), current_workers.end(),
+                           ModelSafeWorkerGroupIs(GROUP_CONTROL));
+    if (it != current_workers.end())
+      result_workers->push_back(*it);
+    else
+      NOTREACHED();
+  }
 }
 
 void SyncScheduler::ScheduleConfiguration(
     ModelTypeSet types,
     GetUpdatesCallerInfo::GetUpdatesSource source) {
   DCHECK_EQ(MessageLoop::current(), sync_loop_);
   DCHECK(IsConfigRelatedUpdateSourceValue(source));
   SDVLOG(2) << "Scheduling a config";
 
   ModelSafeRoutingInfo routes;
@@ skipping 536 matching lines @@
 
 #undef SDVLOG_LOC
 
 #undef SDVLOG
 
 #undef SLOG
 
 #undef ENUM_CASE
 
 }  // csync