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

Unified Diff: chrome/common/variations/variations_util.cc

Issue 2236293002: Resolve conflict in chrome://flags and field trial config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: chrome/common/variations/variations_util.cc
diff --git a/chrome/common/variations/variations_util.cc b/chrome/common/variations/variations_util.cc
index cd5062d6eaab877a2e5e5680075902a4ccde9443..dc63a292ee7628202af49601b5cba56b518916c6 100644
--- a/chrome/common/variations/variations_util.cc
+++ b/chrome/common/variations/variations_util.cc
@@ -92,6 +92,13 @@ void AssociateParamsFromFieldTrialConfig(const FieldTrialTestingConfig& config,
base::FieldTrial* trial =
base::FieldTrialList::CreateFieldTrial(group.study, group.group_name);
+ if (!trial) {
+ DLOG(WARNING) << "Field trial config study skipped: " << group.study
+ << "." << group.group_name
+ << " (it is overridden from chrome://flags)";
+ continue;
+ }
+
for (size_t j = 0; j < group.enable_features_size; ++j) {
feature_list->RegisterFieldTrialOverride(
group.enable_features[j], base::FeatureList::OVERRIDE_ENABLE_FEATURE,
« 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