sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

chrome/browser/sync/engine/update_applicator.cc

 // Copyright (c) 2010 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/engine/update_applicator.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
@@ skipping 73 matching lines @@
 
   return true;
 }
 
 void UpdateApplicator::Advance() {
   --end_;
   *pointer_ = *end_;
 }
 
 bool UpdateApplicator::SkipUpdate(const syncable::Entry& entry) {
-  ModelSafeGroup g =
-      GetGroupForModelType(entry.GetServerModelType(), routing_info_);
+  syncable::ModelType type = entry.GetServerModelType();
+  ModelSafeGroup g = GetGroupForModelType(type, routing_info_);
+  // The extra routing_info count check here is to support GetUpdateses for
+  // a subset of the globally enabled types, and not attempt to update items
+  // if their type isn't permitted in the current run.  These would typically
+  // be unapplied items from a previous sync.
   if (g != group_filter_)
     return true;
+  if (g == GROUP_PASSIVE &&
+      !routing_info_.count(type) &&
+      type != syncable::UNSPECIFIED &&
+      type != syncable::TOP_LEVEL_FOLDER) {
+    VLOG(1) << "Skipping update application, type not permitted.";
+    return true;
+  }
   return false;
 }
 
 bool UpdateApplicator::AllUpdatesApplied() const {
   return conflicting_ids_.empty() && begin_ == end_;
 }
 
 void UpdateApplicator::SaveProgressIntoSessionState(
     sessions::ConflictProgress* conflict_progress,
     sessions::UpdateProgress* update_progress) {
   DCHECK(begin_ == end_ || ((pointer_ == end_) && !progress_))
       << "SaveProgress called before updates exhausted.";
 
   vector<syncable::Id>::const_iterator i;
   for (i = conflicting_ids_.begin(); i != conflicting_ids_.end(); ++i) {
     conflict_progress->AddConflictingItemById(*i);
     update_progress->AddAppliedUpdate(CONFLICT, *i);
   }
   for (i = successful_ids_.begin(); i != successful_ids_.end(); ++i) {
     conflict_progress->EraseConflictingItemById(*i);
     update_progress->AddAppliedUpdate(SUCCESS, *i);
   }
 }
 
 }  // namespace browser_sync