[Sync] Migrate bridge implementations to change list based MergeSyncData

components/sync/device_info/device_info_sync_bridge_unittest.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/device_info/device_info_sync_bridge.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 140 matching lines @@
 EntityChangeList EntityAddList(
     const std::vector<DeviceInfoSpecifics>& specifics_list) {
   EntityChangeList changes;
   for (const auto& specifics : specifics_list) {
     changes.push_back(EntityChange::CreateAdd(specifics.cache_guid(),
                                               SpecificsToEntity(specifics)));
   }
   return changes;
 }
 
-// Similar helper to EntityAddList(...), only wraps in a EntityDataMap for a
-// merge call. Order is irrelevant, since the map sorts by key. Should not
-// contain multiple specifics with the same guid.
-EntityDataMap InlineEntityDataMap(
-    const std::vector<DeviceInfoSpecifics>& specifics_list) {
-  EntityDataMap map;
-  for (const auto& specifics : specifics_list) {
-    EXPECT_EQ(map.end(), map.find(specifics.cache_guid()));
-    map[specifics.cache_guid()] = SpecificsToEntity(specifics);
-  }
-  return map;
-}
-
 }  // namespace
 
 class DeviceInfoSyncBridgeTest : public testing::Test,
                                  public DeviceInfoTracker::Observer {
  protected:
   DeviceInfoSyncBridgeTest()
       : store_(ModelTypeStoreTestUtil::CreateInMemoryStoreForTest()),
         provider_(new LocalDeviceInfoProviderMock()) {
     provider_->Initialize(CreateModel(kDefaultLocalSuffix));
   }
@@ skipping 381 matching lines @@
   auto error2 = bridge()->ApplySyncChanges(bridge()->CreateMetadataChangeList(),
                                            EntityAddList({specifics}));
   EXPECT_FALSE(error2);
   EXPECT_EQ(2u, bridge()->GetAllDeviceInfo().size());
 }
 
 TEST_F(DeviceInfoSyncBridgeTest, MergeEmpty) {
   InitializeAndPump();
   EXPECT_EQ(1, change_count());
   auto error = bridge()->MergeSyncData(bridge()->CreateMetadataChangeList(),
-                                       EntityDataMap());
+                                       EntityChangeList());
   EXPECT_FALSE(error);
   EXPECT_EQ(1, change_count());
   // TODO(skym): Stop sending local twice. The first of the two puts will
   // probably happen before the processor is tracking metadata yet, and so there
   // should not be much overhead.
   EXPECT_EQ(2u, processor().put_multimap().size());
   EXPECT_EQ(2u, processor().put_multimap().count(
                     local_device()->GetLocalDeviceInfo()->guid()));
   EXPECT_EQ(0u, processor().delete_set().size());
 }
@@ skipping 10 matching lines @@
 
   WriteToStore({unique_local, conflict_local});
   InitializeAndPump();
   EXPECT_EQ(1, change_count());
 
   ModelTypeState state = StateWithEncryption("ekn");
   std::unique_ptr<MetadataChangeList> metadata_changes =
       bridge()->CreateMetadataChangeList();
   metadata_changes->UpdateModelTypeState(state);
 
-  auto error = bridge()->MergeSyncData(
-      std::move(metadata_changes),
-      InlineEntityDataMap({conflict_remote, unique_remote}));
+  auto error =
+      bridge()->MergeSyncData(std::move(metadata_changes),
+                              EntityAddList({conflict_remote, unique_remote}));
   EXPECT_FALSE(error);
   EXPECT_EQ(2, change_count());
 
   // The remote should beat the local in conflict.
   EXPECT_EQ(4u, bridge()->GetAllDeviceInfo().size());
   VerifyEqual(unique_local,
               *bridge()->GetDeviceInfo(unique_local.cache_guid()).get());
   VerifyEqual(unique_remote,
               *bridge()->GetDeviceInfo(unique_remote.cache_guid()).get());
   VerifyEqual(conflict_remote, *bridge()->GetDeviceInfo(conflict_guid).get());
@@ skipping 13 matching lines @@
 
 TEST_F(DeviceInfoSyncBridgeTest, MergeLocalGuid) {
   // If not recent, then reconcile is going to try to send an updated version to
   // Sync, which makes interpreting change_count() more difficult.
   const DeviceInfoSpecifics specifics =
       CreateSpecifics(kDefaultLocalSuffix, Time::Now());
   WriteToStore({specifics});
   InitializeAndPump();
 
   auto error = bridge()->MergeSyncData(bridge()->CreateMetadataChangeList(),
-                                       InlineEntityDataMap({specifics}));
+                                       EntityAddList({specifics}));
   EXPECT_FALSE(error);
   EXPECT_EQ(0, change_count());
   EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
   EXPECT_TRUE(processor().delete_set().empty());
   EXPECT_TRUE(processor().put_multimap().empty());
 }
 
 TEST_F(DeviceInfoSyncBridgeTest, MergeLocalGuidBeforeReconcile) {
   InitializeBridge();
 
   // The message loop is never pumped, which means local data/metadata is never
   // loaded, and thus reconcile is never called. The bridge should ignore this
   // EntityData because its cache guid is the same the local device's.
   auto error = bridge()->MergeSyncData(
       bridge()->CreateMetadataChangeList(),
-      InlineEntityDataMap({CreateSpecifics(kDefaultLocalSuffix)}));
+      EntityAddList({CreateSpecifics(kDefaultLocalSuffix)}));
   EXPECT_FALSE(error);
   EXPECT_EQ(0, change_count());
   EXPECT_EQ(0u, bridge()->GetAllDeviceInfo().size());
 }
 
 TEST_F(DeviceInfoSyncBridgeTest, ClearProviderAndMerge) {
   // This will initialize the provider a first time.
   InitializeAndPump();
   EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
 
   const DeviceInfoSpecifics specifics = CreateSpecifics(1, Time::Now());
 
   local_device()->Clear();
   auto error1 = bridge()->MergeSyncData(bridge()->CreateMetadataChangeList(),
-                                        InlineEntityDataMap({specifics}));
+                                        EntityAddList({specifics}));
   EXPECT_FALSE(error1);
   EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
 
   local_device()->Initialize(CreateModel(kDefaultLocalSuffix));
   auto error2 = bridge()->MergeSyncData(bridge()->CreateMetadataChangeList(),
-                                        InlineEntityDataMap({specifics}));
+                                        EntityAddList({specifics}));
   EXPECT_FALSE(error2);
   EXPECT_EQ(2u, bridge()->GetAllDeviceInfo().size());
 }
 
 TEST_F(DeviceInfoSyncBridgeTest, CountActiveDevices) {
   InitializeAndPump();
   EXPECT_EQ(1, bridge()->CountActiveDevices());
 
   // Regardless of the time, these following two ApplySyncChanges(...) calls
   // have the same guid as the local device.
@@ skipping 73 matching lines @@
 
   // Reloading from storage shouldn't contain remote data.
   RestartBridge();
   EXPECT_EQ(1u, bridge()->GetAllDeviceInfo().size());
   EXPECT_EQ(4, change_count());
 }
 
 }  // namespace
 
 }  // namespace syncer