Follow-up of Improve the ProfileInfoCache API

chrome/browser/profiles/profile_statistics.cc

Index: chrome/browser/profiles/profile_statistics.cc
diff --git a/chrome/browser/profiles/profile_statistics.cc b/chrome/browser/profiles/profile_statistics.cc
index 923cc38bc92bd57ab33a5ef992f59da07ff32e3b..0cc5f220feb2f036395140f7459d2cca7eadbc1c 100644
--- a/chrome/browser/profiles/profile_statistics.cc
+++ b/chrome/browser/profiles/profile_statistics.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
@@ -354,10 +353,9 @@ void GatherProfileStatistics(Profile* profile,
 
 ProfileCategoryStats GetProfileStatisticsFromCache(

[lwchkg, 2016/01/17 12:33:28]

This function will be renamed to GetProfileStatisticsFromAttributesStorage in a
follow-up CL. WDYT about the function name?

[anthonyvd, 2016/01/18 15:22:31]

I think this functionality (as well as the other one you left a comment on)
should probably be moved to the ProfileAttributesStorage/Entry since ultimately
it's just forwarding info it gets from there.

[lwchkg, 2016/01/18 17:54:02]

The decision of putting these two functions here was made in the following CL :
https://codereview.chromium.org/1415223002/diff/190001/chrome/browser/profile...

Summary: My first implementation did something you suggested here, but Mike was
against returning a std::map from ProfileInfoCache. His reason is: it isn't
ProfileInfoCache's role to return a structure.

Finally I agreed with him so the conversions from those bool and int into
structures (i.e. ProfileCategoryStats and base::DictionaryValue) are done here
and also in user_manager_screen_handler.cc.

Note: the CL about the second file is found in
https://codereview.chromium.org/1428973003/ . No more related discussion is made
there though.

     const base::FilePath& profile_path) {
-  ProfileInfoCache& profile_info_cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
   ProfileAttributesEntry* entry = nullptr;
-  bool has_entry = profile_info_cache.
+  bool has_entry = g_browser_process->profile_manager()->
+      GetProfileAttributesStorage().
       GetProfileAttributesWithPath(profile_path, &entry);
 
   ProfileCategoryStats stats;
@@ -397,9 +395,9 @@ void SetProfileStatisticsInCache(const base::FilePath& profile_path,
   if (!profile_manager)
     return;
 
-  ProfileInfoCache& profile_info_cache = profile_manager->GetProfileInfoCache();
   ProfileAttributesEntry* entry = nullptr;
-  if (!profile_info_cache.GetProfileAttributesWithPath(profile_path, &entry))
+  if (!profile_manager->GetProfileAttributesStorage().
+      GetProfileAttributesWithPath(profile_path, &entry))
     return;
 
   if (category == kProfileStatisticsBrowsingHistory) {