Utilize ProfileInfoCache to support data type counts in profile deletion flow

chrome/browser/ui/browser.cc

 // Copyright 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 50 matching lines @@
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/memory/tab_manager_web_contents_data.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/pepper_broker_infobar_delegate.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_destroyer.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/repost_form_warning_controller.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 426 matching lines @@
   SessionService* session_service =
       SessionServiceFactory::GetForProfile(profile_);
   if (session_service)
     session_service->WindowClosed(session_id_);
 
   sessions::TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile());
   if (tab_restore_service)
     tab_restore_service->BrowserClosed(live_tab_context());
 
+  if (!chrome::GetTotalBrowserCountForProfile(profile_)) {
 #if !defined(OS_MACOSX)
-  if (!chrome::GetTotalBrowserCountForProfile(profile_)) {
     // We're the last browser window with this profile. We need to nuke the
     // TabRestoreService, which will start the shutdown of the
     // NavigationControllers and allow for proper shutdown. If we don't do this
     // chrome won't shutdown cleanly, and may end up crashing when some
     // thread tries to use the IO thread (or another thread) that is no longer
     // valid.
     // This isn't a valid assumption for Mac OS, as it stays running after
     // the last browser has closed. The Mac equivalent is in its app
     // controller.
     TabRestoreServiceFactory::ResetForProfile(profile_);
+#endif
+
+    // Store statistics into ProfileInfoCache

[Mike Lerman, 2015/11/03 20:50:42]

nit: amend a period. Although this comment isn't necessary, as all those words
are in the method name.

[lwchkg, 2015/11/04 00:11:07]

Acknowledged.

+    profiles::StoreProfileStatisticsToCache(profile_);

[Mike Lerman, 2015/11/03 20:50:42]

There's a better place for this hook. Put this in
ProfileManager::BrowserListObserver::OnBrowserRemoved
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/pro...).

Advantages:
- it already deals with incognito profiles for you
- it only runs on desktop (non-mobile) platforms, which is the only places we'd
want it anyways

[lwchkg, 2015/11/04 00:11:07]

Sounds good! Will check tonight.

   }
-#endif
 
   profile_pref_registrar_.RemoveAll();
 
   encoding_auto_detect_.Destroy();
 
   // Destroy BrowserExtensionWindowController before the incognito profile
   // is destroyed to make sure the chrome.windows.onRemoved event is sent.
   extension_window_controller_.reset();
 
   // Destroy BrowserInstantController before the incongnito profile is destroyed
@@ skipping 2154 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }