Refactor map/hashtable members of ProfileInfoCache to std::unordered_map

A few private members of ProfileInfoCache are refactored to
std::unordered_map and std::unique_ptr. These members will be moved
into ProfileAttributesStorage in future CLs.

BUG=305720, 576864

Review-Url: https://codereview.chromium.org/1944823003
Cr-Commit-Position: refs/heads/master@{#393226}
diff --git a/chrome/browser/profiles/profile_info_cache_unittest.cc b/chrome/browser/profiles/profile_info_cache_unittest.cc
index f875f91..15fd1a7 100644
--- a/chrome/browser/profiles/profile_info_cache_unittest.cc
+++ b/chrome/browser/profiles/profile_info_cache_unittest.cc
@@ -608,7 +608,7 @@
   // The file should have been cached and saved.
   EXPECT_EQ(1U, profile_info_cache.cached_avatar_images_.size());
   EXPECT_TRUE(profile_info_cache.GetHighResAvatarOfProfileAtIndex(0));
-  EXPECT_EQ(profile_info_cache.cached_avatar_images_[file_name],
+  EXPECT_EQ(profile_info_cache.cached_avatar_images_[file_name].get(),
       profile_info_cache.GetHighResAvatarOfProfileAtIndex(0));
 
   // Make sure everything has completed, and the file has been written to disk.