[Sync] Migrate bridge implementations to change list based MergeSyncData

components/sync/model/model_type_sync_bridge.cc

 // Copyright 2015 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 "components/sync/model/model_type_sync_bridge.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/metadata_change_list.h"
 
 namespace syncer {
 
 ModelTypeSyncBridge::ModelTypeSyncBridge(
     const ChangeProcessorFactory& change_processor_factory,
     ModelType type)
     : type_(type),
       change_processor_factory_(change_processor_factory),
       change_processor_(change_processor_factory_.Run(type_, this)) {}
 
 ModelTypeSyncBridge::~ModelTypeSyncBridge() {}
 
-base::Optional<ModelError> ModelTypeSyncBridge::MergeSyncData(
-    std::unique_ptr<MetadataChangeList> metadata_change_list,
-    EntityChangeList entity_data) {
-  EntityDataMap entity_data_map;
-  for (const auto& change : entity_data) {
-    DCHECK_EQ(EntityChange::ACTION_ADD, change.type());
-    DCHECK(!change.storage_key().empty());
-    DCHECK(entity_data_map.find(change.storage_key()) == entity_data_map.end());
-    entity_data_map.emplace(change.storage_key(), change.data_ptr());
-  }
-  return MergeSyncData(std::move(metadata_change_list), entity_data_map);
-}
-
 bool ModelTypeSyncBridge::SupportsGetStorageKey() const {
   return true;
 }
 
 ConflictResolution ModelTypeSyncBridge::ResolveConflict(
     const EntityData& local_data,
     const EntityData& remote_data) const {
   if (remote_data.is_deleted()) {
     DCHECK(!local_data.is_deleted());
     return ConflictResolution::UseLocal();
@@ skipping 16 matching lines @@
   // while the models are loading, aka before the service has finished loading
   // the initial metadata.
   change_processor_->ModelReadyToSync(base::MakeUnique<MetadataBatch>());
 }
 
 ModelTypeChangeProcessor* ModelTypeSyncBridge::change_processor() const {
   return change_processor_.get();
 }
 
 }  // namespace syncer