Record shutdown type UMA

chrome/browser/browser_shutdown.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/browser_shutdown.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 152 matching lines @@
   // consider putting it in BrowserProcessImpl::EndSession.
   PrefService* prefs = g_browser_process->local_state();
 
   // Log the amount of times the user switched profiles during this session.
   ProfileMetrics::LogNumberOfProfileSwitches();
 
   metrics::MetricsService* metrics = g_browser_process->metrics_service();
   if (metrics)
     metrics->RecordCompletedSessionEnd();
 
+  bool restart_last_session = RecordShutdownInfoPrefs();
+
+  prefs->CommitPendingWrite();
+
+#if defined(ENABLE_RLZ)
+  // Cleanup any statics created by RLZ. Must be done before NotificationService
+  // is destroyed.
+  rlz::RLZTracker::CleanupRlz();
+#endif
+
+  return restart_last_session;
+}
+
+bool RecordShutdownInfoPrefs() {
+  PrefService* prefs = g_browser_process->local_state();
   if (g_shutdown_type > NOT_VALID && g_shutdown_num_processes > 0) {
     // Record the shutdown info so that we can put it into a histogram at next
     // startup.
     prefs->SetInteger(prefs::kShutdownType, g_shutdown_type);
     prefs->SetInteger(prefs::kShutdownNumProcesses, g_shutdown_num_processes);
     prefs->SetInteger(prefs::kShutdownNumProcessesSlow,
                       g_shutdown_num_processes_slow);
   }
 
-  // Check local state for the restart flag so we can restart the session below.
+  // Check local state for the restart flag so we can restart the session later.
   bool restart_last_session = false;
   if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
     restart_last_session =
         prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
     prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
   }
-
-  prefs->CommitPendingWrite();
-
-#if defined(ENABLE_RLZ)
-  // Cleanup any statics created by RLZ. Must be done before NotificationService
-  // is destroyed.
-  rlz::RLZTracker::CleanupRlz();
-#endif
-
   return restart_last_session;
 }
 
 void ShutdownPostThreadsStop(int shutdown_flags) {
   delete g_browser_process;
   g_browser_process = NULL;
 
   // crbug.com/95079 - This needs to happen after the browser process object
   // goes away.
   ProfileManager::NukeDeletedProfilesFromDisk();
@@ skipping 112 matching lines @@
   PrefService* prefs = g_browser_process->local_state();
   ShutdownType type =
       static_cast<ShutdownType>(prefs->GetInteger(prefs::kShutdownType));
   int num_procs = prefs->GetInteger(prefs::kShutdownNumProcesses);
   int num_procs_slow = prefs->GetInteger(prefs::kShutdownNumProcessesSlow);
   // clear the prefs immediately so we don't pick them up on a future run
   prefs->SetInteger(prefs::kShutdownType, NOT_VALID);
   prefs->SetInteger(prefs::kShutdownNumProcesses, 0);
   prefs->SetInteger(prefs::kShutdownNumProcessesSlow, 0);
 
+  UMA_HISTOGRAM_ENUMERATION("Shutdown.ShutdownType", type, kNumShutdownTypes);
+
   // Read and delete the file on the file thread.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&ReadLastShutdownFile, type, num_procs, num_procs_slow));
 }
 
 void SetTryingToQuit(bool quitting) {
   g_trying_to_quit = quitting;
 
   if (quitting)
@@ skipping 26 matching lines @@
     base::trace_event::TraceConfig trace_config(
         command_line.GetSwitchValueASCII(switches::kTraceShutdown), "");
     content::TracingController::GetInstance()->StartTracing(
         trace_config,
         content::TracingController::StartTracingDoneCallback());
   }
   TRACE_EVENT0("shutdown", "StartShutdownTracing");
 }
 
 }  // namespace browser_shutdown