sync: Make nudge + config jobs reliable in SyncerThread2

chrome/browser/sync/sessions/sync_session.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
 namespace browser_sync {
 namespace sessions {
 
@@ skipping 22 matching lines @@
   // most recent, while the type/payload map gets merged.
   CoalescePayloads(&source_.types, session.source_.types);
   source_.updates_source = session.source_.updates_source;
 
   std::vector<ModelSafeWorker*> temp;
   std::set_union(workers_.begin(), workers_.end(),
                  session.workers_.begin(), session.workers_.end(),
                  std::back_inserter(temp));
   workers_.swap(temp);
 
-  ModelSafeRoutingInfo temp_r;
-  std::set_union(routing_info_.begin(), routing_info_.end(),
-      session.routing_info_.begin(), session.routing_info_.end(),
-      std::insert_iterator<ModelSafeRoutingInfo>(temp_r, temp_r.begin()));
-  routing_info_.swap(temp_r);
+  // We have to update the model safe routing info to the union. In case the
+  // same key is present in both pick the one from session.
+  for (ModelSafeRoutingInfo::const_iterator it =
+       session.routing_info_.begin();
+       it != session.routing_info_.end();
+       ++it) {
+    routing_info_[it->first] = it->second;
+  }
 }
 
 void SyncSession::ResetTransientState() {
   status_controller_.reset(new StatusController(routing_info_));
 }
 
 SyncSessionSnapshot SyncSession::TakeSnapshot() const {
   syncable::ScopedDirLookup dir(context_->directory_manager(),
                                 context_->account_name());
   if (!dir.good())
@@ skipping 41 matching lines @@
   return ((status->commit_ids().size() < status->unsynced_handles().size()) &&
       status->syncer_status().num_successful_commits > 0) ||
       status->conflict_sets_built() ||
       status->conflicts_resolved();
       // Or, we have conflicting updates, but we're making progress on
       // resolving them...
   }
 
 }  // namespace sessions
 }  // namespace browser_sync