sync: Process 'control' data separately

chrome/browser/sync/glue/sync_backend_registrar.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 <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 namespace browser_sync {
 
 namespace {
 
 // Returns true if the current thread is the native thread for the
 // given group (or if it is undeterminable).
 bool IsOnThreadForGroup(csync::ModelSafeGroup group) {
   switch (group) {
     case csync::GROUP_PASSIVE:
       return false;
+    case csync::GROUP_CONTROL:
+      return false;
     case csync::GROUP_UI:
       return BrowserThread::CurrentlyOn(BrowserThread::UI);
     case csync::GROUP_DB:
       return BrowserThread::CurrentlyOn(BrowserThread::DB);
     case csync::GROUP_FILE:
       return BrowserThread::CurrentlyOn(BrowserThread::FILE);
     case csync::GROUP_HISTORY:
       // TODO(ncarter): How to determine this?
       return true;
     case csync::GROUP_PASSWORD:
@@ skipping 16 matching lines @@
     sync_loop_(sync_loop),
     ui_worker_(new UIModelWorker()),
     stopped_on_ui_thread_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(profile_);
   DCHECK(sync_loop_);
   workers_[csync::GROUP_DB] = new DatabaseModelWorker();
   workers_[csync::GROUP_FILE] = new FileModelWorker();
   workers_[csync::GROUP_UI] = ui_worker_;
   workers_[csync::GROUP_PASSIVE] = new csync::PassiveModelWorker(sync_loop_);
+  workers_[csync::GROUP_CONTROL] = new csync::PassiveModelWorker(sync_loop_);
 
   // Any datatypes that we want the syncer to pull down must be in the
   // routing_info map.  We set them to group passive, meaning that
   // updates will be applied to sync, but not dispatched to the native
   // models.
   for (syncable::ModelTypeSet::Iterator it = initial_types.First();
        it.Good(); it.Inc()) {
-    routing_info_[it.Get()] = csync::GROUP_PASSIVE;
+    if (IsInternalType(it.Get())) {
+      routing_info_[it.Get()] = csync::GROUP_CONTROL;
+    } else {
+      routing_info_[it.Get()] = csync::GROUP_PASSIVE;
+    }
   }
 
   HistoryService* history_service = profile->GetHistoryService(
       Profile::IMPLICIT_ACCESS);
   if (history_service) {
     workers_[csync::GROUP_HISTORY] = new HistoryModelWorker(history_service);
   } else {
     LOG_IF(WARNING, initial_types.Has(syncable::TYPED_URLS))
         << "History store disabled, cannot sync Omnibox History";
     routing_info_.erase(syncable::TYPED_URLS);
@@ skipping 37 matching lines @@
   }
 
   base::AutoLock lock(lock_);
   syncable::ModelTypeSet newly_added_types;
   for (syncable::ModelTypeSet::Iterator it =
            filtered_types_to_add.First();
        it.Good(); it.Inc()) {
     // Add a newly specified data type as csync::GROUP_PASSIVE into the
     // routing_info, if it does not already exist.
     if (routing_info_.count(it.Get()) == 0) {
-      routing_info_[it.Get()] = csync::GROUP_PASSIVE;
+      if (IsInternalType(it.Get())) {
+        routing_info_[it.Get()] = csync::GROUP_CONTROL;
+      } else {
+        routing_info_[it.Get()] = csync::GROUP_PASSIVE;
+      }
       newly_added_types.Put(it.Get());
     }
   }
   for (syncable::ModelTypeSet::Iterator it = types_to_remove.First();
        it.Good(); it.Inc()) {
     routing_info_.erase(it.Get());
   }
 
   // TODO(akalin): Use SVLOG/SLOG if we add any more logging.
   DVLOG(1) << name_ << ": Adding types "
@@ skipping 133 matching lines @@
   return it->second;
 }
 
 bool SyncBackendRegistrar::IsCurrentThreadSafeForModel(
     syncable::ModelType model_type) const {
   lock_.AssertAcquired();
   return IsOnThreadForGroup(GetGroupForModelType(model_type, routing_info_));
 }
 
 }  // namespace browser_sync