Stability execution phase: register shutdown timebomb state in quick exit path

chrome/browser/lifetime/application_lifetime.cc

Index: chrome/browser/lifetime/application_lifetime.cc
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index ec38785c2b31c21a5268b31f6490deb45e11a1f0..2a211971a3417ae1ed7acb415b5ca4c56dba55be 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 
 #include <memory>
+#include <string>
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -36,6 +37,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
+#include "components/metrics/metrics_service.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
@@ -53,7 +55,6 @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
-#include "chrome/common/chrome_constants.h"
 #endif
 
 namespace chrome {
@@ -305,6 +306,11 @@ void SessionEnding() {
   // exit this function.
   ShutdownWatcherHelper shutdown_watcher;
   shutdown_watcher.Arm(base::TimeDelta::FromSeconds(90));
+  PrefService* local_state = g_browser_process->local_state();
+  if (local_state) {

[Alexei Svitkine (slow), 2016/11/25 19:51:31]

Are you sure we need this if?

If try bots pass without, suggest leaving it out.

[manzagop (departed), 2016/11/25 20:16:41]

Done.

+    metrics::MetricsService::SetExecutionPhase(
+        metrics::MetricsService::SHUTDOWN_TIMEBOMB_ARM, local_state);
+  }
 
   browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);