Follow-up of Improve the ProfileInfoCache API

chrome/browser/profiles/profile_statistics.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 "chrome/browser/profiles/profile_statistics.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/task_runner.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_service_factory.h"
 #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"
 #include "components/history/core/browser/history_service.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
@@ skipping 313 matching lines @@
   DCHECK(profile);
   if (profile->IsOffTheRecord() || profile->IsSystemProfile()) {
     NOTREACHED();
     return;
   }
 
   scoped_refptr<ProfileStatisticsAggregator> aggregator =
       new ProfileStatisticsAggregator(profile, callback, tracker);
 }
 
 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;
   ProfileCategoryStat stat;
 
   stat.category = kProfileStatisticsBrowsingHistory;
   stat.success = has_entry ? entry->HasStatsBrowsingHistory() : false;
   stat.count = stat.success ? entry->GetStatsBrowsingHistory() : 0;
   stats.push_back(stat);
 
   stat.category = kProfileStatisticsPasswords;
   stat.success = has_entry ? entry->HasStatsPasswords() : false;
   stat.count = stat.success ? entry->GetStatsPasswords() : 0;
   stats.push_back(stat);
 
   stat.category = kProfileStatisticsBookmarks;
   stat.success = has_entry ? entry->HasStatsBookmarks() : false;
   stat.count = stat.success ? entry->GetStatsBookmarks() : 0;
   stats.push_back(stat);
 
   stat.category = kProfileStatisticsSettings;
   stat.success = has_entry ? entry->HasStatsSettings() : false;
   stat.count = stat.success ? entry->GetStatsSettings() : 0;
   stats.push_back(stat);
 
   return stats;
 }
 
 void SetProfileStatisticsInCache(const base::FilePath& profile_path,

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

Similarly, this function will be renamed
SetProfileStatisticsInAttributesStorage.

[Mike Lerman, 2016/01/19 16:57:46]

Or just SetProfileStatisticsInStorage. (don't need Atttributes any more than we
didn't need Info before)

                                  const std::string& category, int count) {
   // If local_state() is null, profile_manager() will seg-fault.
   if (!g_browser_process || !g_browser_process->local_state())
     return;
 
   // profile_manager() may return a null pointer.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   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) {
     entry->SetStatsBrowsingHistory(count);
   } else if (category == kProfileStatisticsPasswords) {
     entry->SetStatsPasswords(count);
   } else if (category == kProfileStatisticsBookmarks) {
     entry->SetStatsBookmarks(count);
   } else if (category == kProfileStatisticsSettings) {
     entry->SetStatsSettings(count);
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace profiles