[DeviceSync v2] Use typedef-name for Instance ID to CryptAuthDevice map

Bug: 951969
Change-Id: If21acded7077b018a15c61dd2b30a9b3d161bef4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1650029
Commit-Queue: Josh Nohle <nohle@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Auto-Submit: Josh Nohle <nohle@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667257}

chromeos/services/device_sync/cryptauth_device_registry.cc

@@ -14,7 +14,7 @@ CryptAuthDeviceRegistry::CryptAuthDeviceRegistry() = default;
 
 CryptAuthDeviceRegistry::~CryptAuthDeviceRegistry() = default;
 
-const base::flat_map<std::string, CryptAuthDevice>&
+const CryptAuthDeviceRegistry::InstanceIdToDeviceMap&
 CryptAuthDeviceRegistry::instance_id_to_device_map() const {
   return instance_id_to_device_map_;
 }
@@ -50,7 +50,7 @@ bool CryptAuthDeviceRegistry::DeleteDevice(const std::string& instance_id) {
 }
 
 bool CryptAuthDeviceRegistry::SetRegistry(
-    const base::flat_map<std::string, CryptAuthDevice>&
+    const CryptAuthDeviceRegistry::InstanceIdToDeviceMap&
         instance_id_to_device_map) {
   if (instance_id_to_device_map_ == instance_id_to_device_map)
     return false;

chromeos/services/device_sync/cryptauth_device_registry.h

@@ -18,11 +18,12 @@ namespace device_sync {
 // Stores the devices managed by CryptAuth v2 DeviceSync.
 class CryptAuthDeviceRegistry {
  public:
+  using InstanceIdToDeviceMap = base::flat_map<std::string, CryptAuthDevice>;
+
   virtual ~CryptAuthDeviceRegistry();
 
   // Returns a map from Instance ID to CryptAuthDevice.
-  const base::flat_map<std::string, CryptAuthDevice>&
-  instance_id_to_device_map() const;
+  const InstanceIdToDeviceMap& instance_id_to_device_map() const;
 
   // Returns the device with Instance ID |instance_id| if it exists in the
   // registry, and returns null if it cannot be found.
@@ -39,8 +40,7 @@ class CryptAuthDeviceRegistry {
 
   // Replaces the entire registry with |instance_id_to_device_map|. Returns true
   // if the registry changes.
-  bool SetRegistry(const base::flat_map<std::string, CryptAuthDevice>&
-                       instance_id_to_device_map);
+  bool SetRegistry(const InstanceIdToDeviceMap& instance_id_to_device_map);
 
  protected:
   CryptAuthDeviceRegistry();
@@ -49,7 +49,7 @@ class CryptAuthDeviceRegistry {
   virtual void OnDeviceRegistryUpdated() = 0;
 
  private:
-  base::flat_map<std::string, CryptAuthDevice> instance_id_to_device_map_;
+  InstanceIdToDeviceMap instance_id_to_device_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CryptAuthDeviceRegistry);
 };

chromeos/services/device_sync/cryptauth_device_registry_impl.cc

@@ -7,7 +7,6 @@
 #include <string>
 #include <utility>
 
-#include "base/containers/flat_map.h"
 #include "base/memory/ptr_util.h"
 #include "base/no_destructor.h"
 #include "base/optional.h"
@@ -59,7 +58,7 @@ CryptAuthDeviceRegistryImpl::CryptAuthDeviceRegistryImpl(
     : pref_service_(pref_service) {
   const base::Value* dict = pref_service_->Get(prefs::kCryptAuthDeviceRegistry);
 
-  base::flat_map<std::string, CryptAuthDevice> instance_id_to_device_map;
+  CryptAuthDeviceRegistry::InstanceIdToDeviceMap instance_id_to_device_map;
   for (const std::pair<const std::string&, const base::Value&>& id_device_pair :
        dict->DictItems()) {
     base::Optional<std::string> instance_id =

chromeos/services/device_sync/cryptauth_device_registry_impl_unittest.cc

@@ -9,13 +9,13 @@
 #include <string>
 #include <utility>
 
-#include "base/containers/flat_map.h"
 #include "base/macros.h"
 #include "base/no_destructor.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/components/multidevice/software_feature.h"
 #include "chromeos/components/multidevice/software_feature_state.h"
+#include "chromeos/services/device_sync/cryptauth_device_registry.h"
 #include "chromeos/services/device_sync/pref_names.h"
 #include "chromeos/services/device_sync/proto/cryptauth_better_together_device_metadata.pb.h"
 #include "chromeos/services/device_sync/proto/cryptauth_v2_test_util.h"
@@ -87,7 +87,7 @@ class DeviceSyncCryptAuthDeviceRegistryImplTest : public testing::Test {
   }
 
   base::Value AsDictionary(
-      const base::flat_map<std::string, CryptAuthDevice>& devices) const {
+      const CryptAuthDeviceRegistry::InstanceIdToDeviceMap& devices) const {
     base::Value dict(base::Value::Type::DICTIONARY);
     for (const std::pair<std::string, CryptAuthDevice>& id_device_pair :
          devices) {
@@ -99,7 +99,7 @@ class DeviceSyncCryptAuthDeviceRegistryImplTest : public testing::Test {
   }
 
   void VerifyDeviceRegistry(
-      const base::flat_map<std::string, CryptAuthDevice>& expected_devices) {
+      const CryptAuthDeviceRegistry::InstanceIdToDeviceMap& expected_devices) {
     EXPECT_EQ(expected_devices, device_registry()->instance_id_to_device_map());
 
     // Verify pref.
@@ -150,13 +150,13 @@ TEST_F(DeviceSyncCryptAuthDeviceRegistryImplTest, OverwriteDevice) {
 TEST_F(DeviceSyncCryptAuthDeviceRegistryImplTest, OverwriteRegistry) {
   CreateDeviceRegistry();
 
-  base::flat_map<std::string, CryptAuthDevice> old_devices = {
+  CryptAuthDeviceRegistry::InstanceIdToDeviceMap old_devices = {
       {kInstanceId0, GetDeviceForTest(0)}};
   EXPECT_TRUE(device_registry()->SetRegistry(old_devices));
   VerifyDeviceRegistry(old_devices);
   EXPECT_FALSE(device_registry()->SetRegistry(old_devices));
 
-  base::flat_map<std::string, CryptAuthDevice> new_devices = {
+  CryptAuthDeviceRegistry::InstanceIdToDeviceMap new_devices = {
       {kInstanceId1, GetDeviceForTest(1)}};
   EXPECT_TRUE(device_registry()->SetRegistry(new_devices));
   VerifyDeviceRegistry(new_devices);
@@ -176,7 +176,7 @@ TEST_F(DeviceSyncCryptAuthDeviceRegistryImplTest, DeleteDevice) {
 }
 
 TEST_F(DeviceSyncCryptAuthDeviceRegistryImplTest, PopulateRegistryFromPref) {
-  base::flat_map<std::string, CryptAuthDevice> expected_devices = {
+  CryptAuthDeviceRegistry::InstanceIdToDeviceMap expected_devices = {
       {kInstanceId0, GetDeviceForTest(0)}, {kInstanceId1, GetDeviceForTest(1)}};
   pref_service()->Set(prefs::kCryptAuthDeviceRegistry,
                       AsDictionary(expected_devices));