Support variation params for forcing_flag groups.

components/variations/variations_seed_processor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/variations/variations_seed_processor.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 25 matching lines @@
 #else
 #error Unknown platform
 #endif
 }
 
 // Converts |date_time| in Study date format to base::Time.
 base::Time ConvertStudyDateToBaseTime(int64 date_time) {
   return base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(date_time);
 }
 
+// Associates the variations params of |experiment|, if present.
+void RegisterExperimentParams(const Study& study,
+                              const Study_Experiment& experiment) {
+  std::map<std::string, std::string> params;
+  for (int i = 0; i < experiment.param_size(); ++i) {
+    if (experiment.param(i).has_name() && experiment.param(i).has_value())
+      params[experiment.param(i).name()] = experiment.param(i).value();
+  }
+  if (!params.empty())
+    AssociateVariationParams(study.name(), experiment.name(), params);
+}
+
 }  // namespace
 
 VariationsSeedProcessor::VariationsSeedProcessor() {
 }
 
 VariationsSeedProcessor::~VariationsSeedProcessor() {
 }
 
 void VariationsSeedProcessor::CreateTrialsFromSeed(
     const VariationsSeed& seed,
@@ skipping 105 matching lines @@
     return;
 
   // Check if any experiments need to be forced due to a command line
   // flag. Force the first experiment with an existing flag.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   for (int i = 0; i < study.experiment_size(); ++i) {
     const Study_Experiment& experiment = study.experiment(i);
     if (experiment.has_forcing_flag() &&
         command_line->HasSwitch(experiment.forcing_flag())) {
       base::FieldTrialList::CreateFieldTrial(study.name(), experiment.name());
+      RegisterExperimentParams(study, experiment);
       DVLOG(1) << "Trial " << study.name() << " forced by flag: "
                << experiment.forcing_flag();
       return;
     }
   }
 
   uint32 randomization_seed = 0;
   base::FieldTrial::RandomizationType randomization_type =
       base::FieldTrial::SESSION_RANDOMIZED;
   if (study.has_consistency() &&
       study.consistency() == Study_Consistency_PERMANENT) {
     randomization_type = base::FieldTrial::ONE_TIME_RANDOMIZED;
     if (study.has_randomization_seed())
       randomization_seed = study.randomization_seed();
   }
 
   // The trial is created without specifying an expiration date because the
   // expiration check in field_trial.cc is based on the build date. Instead,
   // the expiration check using |reference_date| is done explicitly below.
   scoped_refptr<base::FieldTrial> trial(
       base::FieldTrialList::FactoryGetFieldTrialWithRandomizationSeed(
           study.name(), total_probability, study.default_experiment_name(),
           base::FieldTrialList::kNoExpirationYear, 1, 1, randomization_type,
           randomization_seed, NULL));
 
   for (int i = 0; i < study.experiment_size(); ++i) {
     const Study_Experiment& experiment = study.experiment(i);
-
-    std::map<std::string, std::string> params;
-    for (int j = 0; j < experiment.param_size(); j++) {
-      if (experiment.param(j).has_name() && experiment.param(j).has_value())
-        params[experiment.param(j).name()] = experiment.param(j).value();
-    }
-    if (!params.empty())
-      AssociateVariationParams(study.name(), experiment.name(), params);
+    RegisterExperimentParams(study, experiment);
 
     // Groups with flags can't be selected randomly, so we don't add them to
     // the field trial.
     if (experiment.has_forcing_flag())
       continue;
 
     if (experiment.name() != study.default_experiment_name())
       trial->AppendGroup(experiment.name(), experiment.probability_weight());
 
     if (experiment.has_google_web_experiment_id()) {
@@ skipping 119 matching lines @@
     // The default group was not found in the list of groups. This study is not
     // valid.
     return false;
   }
 
   *total_probability = divisor;
   return true;
 }
 
 }  // namespace chrome_variations