Send metrics with embedded system profiles after system startup.

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 9d24cd6d1250da3fa82ebc11a87e69346b57338f..7d6a82a3847c786dd26cdfd577597e18484d5e26 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -177,6 +177,7 @@ void RegisterOrRemovePreviousRunMetricsFile(
     bool metrics_reporting_enabled,
     const base::FilePath& dir,
     base::StringPiece metrics_name,
+    bool require_internal_profile,
     scoped_refptr<base::TaskRunner> task_runner,
     metrics::FileMetricsProvider* file_metrics_provider) {
   base::FilePath metrics_file;
@@ -188,7 +189,11 @@ void RegisterOrRemovePreviousRunMetricsFile(
     file_metrics_provider->RegisterSource(
         metrics_file,
         metrics::FileMetricsProvider::SOURCE_HISTOGRAMS_ATOMIC_FILE,
-        metrics::FileMetricsProvider::ASSOCIATE_PREVIOUS_RUN, metrics_name);
+        require_internal_profile
+            ? metrics::FileMetricsProvider::ASSOCIATE_INTERNAL_PROFILE
+            : metrics::FileMetricsProvider::
+                  ASSOCIATE_INTERNAL_PROFILE_OR_PREVIOUS_RUN,

[Alexei Svitkine (slow), 2017/06/09 16:08:33]

Nit: Maybe just pass the enum to the function directly.

[bcwhite, 2017/06/09 16:59:09]

Done.

+        metrics_name);
   } else {
     // When metrics reporting is not enabled, any existing file should be
     // deleted in order to preserve user privacy.
@@ -223,7 +228,7 @@ std::unique_ptr<metrics::FileMetricsProvider> CreateFileMetricsProvider(
         metrics_reporting_enabled && (send_unreported == "yes");
     RegisterOrRemovePreviousRunMetricsFile(
         report_previous_persistent_histograms, user_data_dir,
-        ChromeMetricsServiceClient::kBrowserMetricsName, task_runner,
+        ChromeMetricsServiceClient::kBrowserMetricsName, true, task_runner,
         file_metrics_provider.get());
 
     // Register the Crashpad metrics files.
@@ -231,7 +236,7 @@ std::unique_ptr<metrics::FileMetricsProvider> CreateFileMetricsProvider(
     // cleanly.
     RegisterOrRemovePreviousRunMetricsFile(
         metrics_reporting_enabled, user_data_dir,
-        kCrashpadHistogramAllocatorName, task_runner,
+        kCrashpadHistogramAllocatorName, false, task_runner,
         file_metrics_provider.get());
     if (metrics_reporting_enabled) {
       base::FilePath active_path;