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

Unified Diff: components/metrics/metrics_state_manager.cc

Issue 2236383002: Temporary hack to fix telemetry_perf_unittests flakes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nullptr Created 4 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/metrics/metrics_state_manager.cc
diff --git a/components/metrics/metrics_state_manager.cc b/components/metrics/metrics_state_manager.cc
index cf1b4a126abd6af56515dfd07f84d84c1fbf01bf..b470e3db1e6cbc1a8a473b6628a16a74b6d2adff 100644
--- a/components/metrics/metrics_state_manager.cc
+++ b/components/metrics/metrics_state_manager.cc
@@ -257,7 +257,11 @@ MetricsStateManager::LoadClientInfoAndMaybeMigrate() {
// The GUID retrieved (and possibly fixed above) should be valid unless
// retrieval failed.
- DCHECK(!client_info || base::IsValidGUID(client_info->client_id));
+ // DCHECK(!client_info || base::IsValidGUID(client_info->client_id));
+ // Temporary hack for http://crbug.com/635255.
+ // TODO(asvitkine): address this the right way.
+ if (client_info && !base::IsValidGUID(client_info->client_id))
+ return nullptr;
return client_info;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698