sync: Process 'control' data separately

sync/engine/sync_scheduler_whitebox_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 "base/message_loop.h"
 #include "base/time.h"
 #include "sync/engine/sync_scheduler.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/sessions/test_util.h"
@@ skipping 15 matching lines @@
 using sync_pb::GetUpdatesCallerInfo;
 
 class SyncSchedulerWhiteboxTest : public testing::Test {
  public:
   virtual void SetUp() {
     dir_maker_.SetUp();
     Syncer* syncer = new Syncer();
 
     ModelSafeRoutingInfo routes;
     routes[syncable::BOOKMARKS] = GROUP_UI;
-    routes[syncable::NIGORI] = GROUP_PASSIVE;
+    routes[syncable::NIGORI] = GROUP_CONTROL;
 
     workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
     workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_PASSIVE)));
+    workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_CONTROL)));
 
     std::vector<ModelSafeWorker*> workers;
     for (std::vector<scoped_refptr<FakeModelWorker> >::iterator it =
          workers_.begin(); it != workers_.end(); ++it) {
       workers.push_back(it->get());
     }
 
     connection_.reset(new MockConnectionManager(NULL));
     throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL));
     context_.reset(
@@ skipping 209 matching lines @@
   struct SyncScheduler::SyncSessionJob job;
   job.purpose = SyncScheduler::SyncSessionJob::CONFIGURATION;
   job.scheduled_start = TimeTicks::Now();
   job.is_canary_job = true;
   SyncScheduler::JobProcessDecision decision = DecideOnJob(job);
 
   EXPECT_EQ(decision, SyncScheduler::CONTINUE);
 }
 
 }  // namespace csync