Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Unified Diff: chrome/browser/metrics/chrome_metrics_service_client.cc

Issue 2918533003: Send metrics with embedded system profiles after system startup. (Closed)
Patch Set: addressed final review comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/metrics/file_metrics_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..699bee1e97049e74d0cf75181d6cfa8439dbb3dc 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,
+ metrics::FileMetricsProvider::SourceAssociation association,
scoped_refptr<base::TaskRunner> task_runner,
metrics::FileMetricsProvider* file_metrics_provider) {
base::FilePath metrics_file;
@@ -188,7 +189,7 @@ void RegisterOrRemovePreviousRunMetricsFile(
file_metrics_provider->RegisterSource(
metrics_file,
metrics::FileMetricsProvider::SOURCE_HISTOGRAMS_ATOMIC_FILE,
- metrics::FileMetricsProvider::ASSOCIATE_PREVIOUS_RUN, metrics_name);
+ association, metrics_name);
} else {
// When metrics reporting is not enabled, any existing file should be
// deleted in order to preserve user privacy.
@@ -223,7 +224,8 @@ 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,
+ metrics::FileMetricsProvider::ASSOCIATE_INTERNAL_PROFILE, task_runner,
file_metrics_provider.get());
// Register the Crashpad metrics files.
@@ -231,8 +233,10 @@ std::unique_ptr<metrics::FileMetricsProvider> CreateFileMetricsProvider(
// cleanly.
RegisterOrRemovePreviousRunMetricsFile(
metrics_reporting_enabled, user_data_dir,
- kCrashpadHistogramAllocatorName, task_runner,
- file_metrics_provider.get());
+ kCrashpadHistogramAllocatorName,
+ metrics::FileMetricsProvider::
+ ASSOCIATE_INTERNAL_PROFILE_OR_PREVIOUS_RUN,
+ task_runner, file_metrics_provider.get());
if (metrics_reporting_enabled) {
base::FilePath active_path;
base::GlobalHistogramAllocator::ConstructFilePaths(
« no previous file with comments | « no previous file | components/metrics/file_metrics_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698