Don't clear metrics_client_id on shutdown

chrome/browser/metrics/chrome_metrics_service_client.cc

Index: chrome/browser/metrics/chrome_metrics_service_client.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 9d05aded9bbc3f4298c82196522f5ac6838d50b9..ed4fe07e3de76fd0b621c1c19d21b31f16e43770 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -236,7 +236,10 @@ void ChromeMetricsServiceClient::SetMetricsClientId(
 }
 
 void ChromeMetricsServiceClient::OnRecordingDisabled() {
-  crash_keys::ClearMetricsClientId();
+  // If we're shutting down, don't drop the metrics_client_id, so that late
+  // crashes won't lose it.
+  if (!g_browser_process->IsShuttingDown())
+    crash_keys::ClearMetricsClientId();
 }
 
 bool ChromeMetricsServiceClient::IsOffTheRecordSessionActive() {