[SYNC] Refactor SyncSourceInfo and add support in chrome invalidation client ...

chrome/browser/sync/sessions/sync_session.cc

 // Copyright (c) 2009 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/model_safe_worker.h"

[akalin, 2011/01/26 01:15:17]

move this to the .h file

[Nicolas Zea, 2011/01/26 01:41:28]

Done.

 #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 {
 
+TypePayloadMap ModelTypeBitSetToTypePayloadMap(
+    const syncable::ModelTypeBitSet& types,
+    const std::string& payload) {
+  TypePayloadMap map;
+  for (size_t i = syncable::FIRST_REAL_MODEL_TYPE;
+       i < types.size();
+       ++i) {

[akalin, 2011/01/26 01:15:17]

this can go on previous line

[Nicolas Zea, 2011/01/26 01:41:28]

Done.

+    if (types[i]) {
+      map[syncable::ModelTypeFromInt(i)] = payload;
+    }
+  }
+  return map;
+}
+
+TypePayloadMap RoutingInfoToTypePayloadMap(const ModelSafeRoutingInfo& routes,
+                                           const std::string& payload) {
+  TypePayloadMap map;
+  for (ModelSafeRoutingInfo::const_iterator i = routes.begin();
+       i != routes.end();
+       ++i) {

[akalin, 2011/01/26 01:15:17]

so can this

[Nicolas Zea, 2011/01/26 01:41:28]

Done.

+    map[i->first] = payload;
+  }
+  return map;
+}
+
+TypePayloadMap CoalescePayloads(const TypePayloadMap& original,
+                                const TypePayloadMap& update) {
+  TypePayloadMap new_map = original;
+  for (TypePayloadMap::const_iterator i = update.begin();
+       i != update.end();
+       ++i) {
+    if (original.count(i->first) == 0) {
+      // If this datatype isn't already in our map, add it with whatever payload
+      // it has.
+      new_map[i->first] = i->second;
+    } else if (i->second.length() > 0) {
+      // If this datatype is already in our map, we only overwrite the payload
+      // if the new one is non-empty.
+      new_map[i->first] = i->second;
+    }
+  }
+  return new_map;
+}
+
+SyncSourceInfo::SyncSourceInfo()
+    : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN) {}
+
+SyncSourceInfo::SyncSourceInfo(
+    const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u,
+    const TypePayloadMap& t)
+    : updates_source(u), types(t) {}
+
 SyncSession::SyncSession(SyncSessionContext* context, Delegate* delegate,
     SyncSourceInfo source,
     const ModelSafeRoutingInfo& routing_info,
     const std::vector<ModelSafeWorker*>& workers)
     : context_(context),
       source_(source),
       write_transaction_(NULL),
       delegate_(delegate),
       workers_(workers),
       routing_info_(routing_info) {
@@ skipping 33 matching lines @@
       delegate_->IsSyncingCurrentlySilenced(),
       status_controller_->unsynced_handles().size(),
       status_controller_->TotalNumConflictingItems(),
       status_controller_->did_commit_items());
 }
 
 SyncSourceInfo SyncSession::TestAndSetSource() {
   SyncSourceInfo old_source = source_;
   source_ = SyncSourceInfo(
       sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION,
-      source_.second);
+      source_.types);
   return old_source;
 }
 
 bool SyncSession::HasMoreToSync() const {
   const StatusController* status = status_controller_.get();
   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