[Sync] Move model_type* from syncable/ to base/

sync/sessions/sync_session.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 "sync/sessions/sync_session.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
-#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/syncable/directory.h"
 
 namespace syncer {
 namespace sessions {
 
 namespace {
 
 std::set<ModelSafeGroup> ComputeEnabledGroups(
     const ModelSafeRoutingInfo& routing_info,
     const std::vector<ModelSafeWorker*>& workers) {
@@ skipping 18 matching lines @@
       }
       // All enabled groups should have a corresponding worker.
       DCHECK(std::includes(
           groups_with_workers.begin(), groups_with_workers.end(),
           enabled_groups.begin(), enabled_groups.end()));
     }
   }
   return enabled_groups;
 }
 
+void PurgeStalePayload(syncable::ModelTypePayloadMap* original,
+                       const ModelSafeRoutingInfo& routing_info) {
+  std::vector<syncable::ModelTypePayloadMap::iterator> iterators_to_delete;
+  for (syncable::ModelTypePayloadMap::iterator i = original->begin();
+       i != original->end(); ++i) {
+    if (routing_info.end() == routing_info.find(i->first)) {
+      iterators_to_delete.push_back(i);
+    }
+  }
+
+  for (std::vector<syncable::ModelTypePayloadMap::iterator>::iterator
+       it = iterators_to_delete.begin(); it != iterators_to_delete.end();
+       ++it) {
+    original->erase(*it);
+  }
+}
+
 }  // namesepace
 
 SyncSession::SyncSession(SyncSessionContext* context, Delegate* delegate,
     const SyncSourceInfo& source,
     const ModelSafeRoutingInfo& routing_info,
     const std::vector<ModelSafeWorker*>& workers)
     : context_(context),
       source_(source),
       write_transaction_(NULL),
       delegate_(delegate),
@@ skipping 191 matching lines @@
   // with the server. Therefore, we verify no errors and at least one SYNCER_OK.
   return reached_server && !HadErrors(state);
 }
 
 void SyncSession::SetFinished() {
   finished_ = true;
 }
 
 }  // namespace sessions
 }  // namespace syncer