Improve the ProfileInfoCache API.

chrome/browser/profiles/profile_info_cache.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_info_interface.h"
 
 namespace gfx {
 class Image;
 }
 
 namespace base {
 class DictionaryValue;
 }
 
 class PrefService;
 class PrefRegistrySimple;
 class ProfileAvatarDownloader;
 
 // This class saves various information about profiles to local preferences.
 // This cache can be used to display a list of profiles without having to
 // actually load the profiles from disk.
 class ProfileInfoCache : public ProfileInfoInterface,
+                         public ProfileAttributesStorage,
                          public base::SupportsWeakPtr<ProfileInfoCache> {
  public:
   ProfileInfoCache(PrefService* prefs, const base::FilePath& user_data_dir);
   ~ProfileInfoCache() override;
 
   // If the |supervised_user_id| is non-empty, the profile will be marked to be
   // omitted from the avatar-menu list on desktop versions. This is used while a
   // supervised user is in the process of being registered with the server. Use
   // SetIsOmittedProfileAtIndex() to clear the flag when the profile is ready to
   // be shown in the menu.
@@ skipping 107 matching lines @@
                              const base::FilePath& profile_path);
 
   void AddObserver(ProfileInfoCacheObserver* obs);
   void RemoveObserver(ProfileInfoCacheObserver* obs);
 
   void set_disable_avatar_download_for_testing(
       bool disable_avatar_download_for_testing) {
     disable_avatar_download_for_testing_ = disable_avatar_download_for_testing;
   }
 
+  // ProfileMetadataStorage:
+  void AddProfile(const base::FilePath& profile_path,
+                  const base::string16& name,
+                  const std::string& gaia_id,
+                  const base::string16& user_name,
+                  size_t icon_index,
+                  const std::string& supervised_user_id) override;
+  void DeleteProfile(const base::FilePath& profile_path) override;
+  std::vector<ProfileAttributesEntry> GetAllProfilesAttributes() override;

[Mike Lerman, 2015/07/02 18:01:31]

This is now an unordered collection. Perhaps return a set instead of a vector to
convey that order isn't fixed/guaranteed/important?

[anthonyvd, 2015/07/07 21:05:32]

I believe this would make using this function hard to use. The callers that need
the elements sorted would have to transfer them to a sortable collection.

Also, std::vector doesn't guarantee anything about order as opposed to std::set
(sorted set) and std::unordered_set faces the problem described above. In that
sense, I personally feel like it relates the "probably not sorted" situation
well while letting callers easily sort it if they need to.

[Mike Lerman, 2015/07/08 18:26:34]

Easily sort - because you can do an in-place sort. Right?

Please leave a comment then, highlighting this understanding.

[anthonyvd, 2015/07/09 17:02:13]

Exactly! Done.

+  bool GetProfileAttributesWithPath(
+      const base::FilePath& path,
+      ProfileAttributesEntry* entry) override;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileInfoCacheTest, DownloadHighResAvatarTest);
   FRIEND_TEST_ALL_PREFIXES(ProfileInfoCacheTest,
                            NothingToDownloadHighResAvatarTest);
 
   const base::DictionaryValue* GetInfoForProfileAtIndex(size_t index) const;
   // Saves the profile info to a cache and takes ownership of |info|.
   void SetInfoForProfileAtIndex(size_t index, base::DictionaryValue* info);
   std::string CacheKeyFromProfilePath(const base::FilePath& profile_path) const;
   std::vector<std::string>::iterator FindPositionForProfile(
@@ skipping 66 matching lines @@
       avatar_images_downloads_in_progress_;
 
   // Determines of the ProfileAvatarDownloader should be created and executed
   // or not. Only set to true for tests.
   bool disable_avatar_download_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileInfoCache);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_