Utilize ProfileInfoCache to support data type counts in profile deletion flow

chrome/browser/profiles/profile_manager.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/password_manager/password_manager_setting_migrator_service_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_metrics.h"
+#include "chrome/browser/profiles/profile_statistics.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/cross_device_promo.h"
 #include "chrome/browser/signin/cross_device_promo_factory.h"
 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 997 matching lines @@
 
   DoFinalInitForServices(profile, go_off_the_record);
   AddProfileToCache(profile);
   DoFinalInitLogging(profile);
 
   ProfileMetrics::LogNumberOfProfiles(this);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_ADDED,
       content::Source<Profile>(profile),
       content::NotificationService::NoDetails());
+
+  // Record statistics to ProfileInfoCache if statistics were not recorded
+  // during shutdown, i.e. the last shutdown was a system shutdown or a crash.
+  if (!profile->IsGuestSession() && !profile->IsSystemProfile() &&
+      !profile->IsNewProfile() && !go_off_the_record &&
+      profile->GetLastSessionExitType() != Profile::EXIT_NORMAL) {
+    profiles::GatherProfileStatistics(
+        profile, profiles::ProfileStatisticsCallback(), nullptr);
+  }
 }
 
 void ProfileManager::DoFinalInitForServices(Profile* profile,
                                             bool go_off_the_record) {
   TRACE_EVENT0("browser", "ProfileManager::DoFinalInitForServices");
   TRACK_SCOPED_REGION("Startup", "ProfileManager::DoFinalInitForServices");
 
 #if defined(ENABLE_EXTENSIONS)
   ProfileInfoCache& cache = GetProfileInfoCache();
 
@@ skipping 387 matching lines @@
 void ProfileManager::BrowserListObserver::OnBrowserRemoved(
     Browser* browser) {
   Profile* profile = browser->profile();
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     if (it->profile()->GetOriginalProfile() == profile->GetOriginalProfile())
       // Not the last window for this profile.
       return;
   }
 
   // If the last browser of a profile that is scheduled for deletion is closed
   // do that now.

[lwchkg, 2015/12/29 04:51:42]

I don't really understand the comment above. The code below reads "if the last
window of a ephemeral profile is closed, remove the ephemeral profile from
disk." I'd rather updating the comment myself. WDYT?

Anyway, the original code review is here:
https://codereview.chromium.org/25495003

   base::FilePath path = profile->GetPath();
   if (profile->GetPrefs()->GetBoolean(prefs::kForceEphemeralProfiles) &&
       !IsProfileMarkedForDeletion(path)) {
     g_browser_process->profile_manager()->ScheduleProfileForDeletion(
         path, ProfileManager::CreateCallback());
+    return;
+  }
+
+  // Otherwise store statistics into ProfileInfoCache.
+  if (!profile->IsOffTheRecord()) {

[lwchkg, 2015/12/22 13:26:00]

Mike said that this function handles incognito profiles for me, but in fact it
doesn't. Is this a bug? (To all: please comment if you know this.)

c.f.
https://codereview.chromium.org/1428973003/diff/20001/chrome/browser/ui/brows...

[Mike Lerman, 2015/12/23 20:25:50]

This, uh, really should handle incognito (and guest) profiles. 

[lwchkg, 2015/12/24 07:14:32]

Thanks. This is likely a bug behind. Maybe someone changed the behavior of the
observer. I'll investigate into this issue.

[lwchkg, 2015/12/29 04:51:43]

(1) Investigated the code about the BrowserListObserver. It is added to the
observer list at the creation of ProfileManager and removed when ProfileManager
is deleted. And it doesn't handling incognito profiles for me AFAIK, so I need
to handle myself.

(2) Anyway, the way of handling incognito profiles is wrong here. I'll update
the code in the next patch.

+    profiles::GatherProfileStatistics(
+        profile, profiles::ProfileStatisticsCallback(), nullptr);
   }
 }
 
 void ProfileManager::BrowserListObserver::OnBrowserSetLastActive(
     Browser* browser) {
   // If all browsers are being closed (e.g. the user is in the process of
   // shutting down), this event will be fired after each browser is
   // closed. This does not represent a user intention to change the active
   // browser so is not handled here.
   if (profile_manager_->closing_all_browsers_)
@@ skipping 32 matching lines @@
 
   FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
   if (!original_callback.is_null())
     original_callback.Run(loaded_profile, status);
 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }