sync: beginnings of MessageLoop based SyncerThread

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/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 {
 
 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) {
   status_controller_.reset(new StatusController(routing_info_));
 }
 
 SyncSession::~SyncSession() {}
 
+void SyncSession::Coalesce(const SyncSession* session) {
+  if (context_ != session->context() || delegate_ != session->delegate_) {
+    NOTREACHED();
+    return;
+  }
+
+  source_ = SyncSourceInfo(session->source_.first,
+                           source_.second | session->source_.second);
+  // TODO(tim): Update routing_info_ and workers_.
+}
+
+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())
     LOG(ERROR) << "Scoped dir lookup failed!";
 
   bool is_share_useable = true;
   syncable::ModelTypeBitSet initial_sync_ended;
   for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
     syncable::ModelType type(syncable::ModelTypeFromInt(i));
@@ skipping 32 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