[Sync] Migrate bridge implementations to change list based MergeSyncData

components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc

 // Copyright 2016 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/autofill/core/browser/webdata/autocomplete_sync_bridge.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 25 matching lines @@
 using base::TimeDelta;
 using sync_pb::AutofillSpecifics;
 using sync_pb::EntityMetadata;
 using sync_pb::EntitySpecifics;
 using sync_pb::ModelTypeState;
 using syncer::DataBatch;
 using syncer::EntityChange;
 using syncer::EntityChangeList;
 using syncer::EntityData;
 using syncer::EntityDataPtr;
-using syncer::EntityDataMap;
 using syncer::FakeModelTypeChangeProcessor;
 using syncer::KeyAndData;
 using syncer::ModelError;
 using syncer::ModelType;
 using syncer::ModelTypeChangeProcessor;
 using syncer::ModelTypeSyncBridge;
 using syncer::RecordingModelTypeChangeProcessor;
 
 namespace autofill {
 
@@ skipping 130 matching lines @@
     return tag;
   }
 
   std::string GetStorageKey(const AutofillSpecifics& specifics) {
     std::string key =
         bridge()->GetStorageKey(SpecificsToEntity(specifics).value());
     EXPECT_FALSE(key.empty());
     return key;
   }
 
-  EntityChangeList EntityAddList(
+  EntityChangeList CreateEntityAddList(
       const std::vector<AutofillSpecifics>& specifics_vector) {
     EntityChangeList changes;
     for (const auto& specifics : specifics_vector) {
       changes.push_back(EntityChange::CreateAdd(GetStorageKey(specifics),
                                                 SpecificsToEntity(specifics)));
     }
     return changes;
   }
 
-  EntityDataMap CreateEntityDataMap(
-      const std::vector<AutofillSpecifics>& specifics_vector) {
-    EntityDataMap map;
-    for (const auto& specifics : specifics_vector) {
-      map[GetStorageKey(specifics)] = SpecificsToEntity(specifics);
-    }
-    return map;
-  }
-
-  void VerifyApplyChanges(const std::vector<EntityChange>& changes) {
+  void VerifyApplyChanges(const EntityChangeList& changes) {
     const auto error = bridge()->ApplySyncChanges(
         bridge()->CreateMetadataChangeList(), changes);
     EXPECT_FALSE(error);
   }
 
   void VerifyApplyAdds(const std::vector<AutofillSpecifics>& specifics) {
-    VerifyApplyChanges(EntityAddList(specifics));
+    VerifyApplyChanges(CreateEntityAddList(specifics));
   }
 
   void VerifyMerge(const std::vector<AutofillSpecifics>& specifics) {
     const auto error = bridge()->MergeSyncData(
-        bridge()->CreateMetadataChangeList(), CreateEntityDataMap(specifics));
+        bridge()->CreateMetadataChangeList(), CreateEntityAddList(specifics));
     EXPECT_FALSE(error);
   }
 
   std::map<std::string, AutofillSpecifics> ExpectedMap(
       const std::vector<AutofillSpecifics>& specifics_vector) {
     std::map<std::string, AutofillSpecifics> map;
     for (const auto& specifics : specifics_vector) {
       map[GetStorageKey(specifics)] = specifics;
     }
     return map;
@@ skipping 440 matching lines @@
   VerifyMerge({remote2, specifics3, remote4});
 
   VerifyAllData({local1, remote2, specifics3, merged4});
   EXPECT_EQ(2u, processor().put_multimap().size());
   VerifyProcessorRecordedPut(local1);
   VerifyProcessorRecordedPut(merged4);
   EXPECT_EQ(0u, processor().delete_set().size());
 }
 
 }  // namespace autofill