Add support for variations controlled overriding UI strings to the variations service.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
+#include "base/strings/utf_string_conversions.h"
 #include "components/variations/processed_study.h"
 #include "components/variations/study_filtering.h"
 #include "components/variations/variations_associated_data.h"
 
 namespace chrome_variations {
 
 namespace {
 
 // Associates the variations params of |experiment|, if present.
 void RegisterExperimentParams(const Study& study,
@@ skipping 30 matching lines @@
   if (experiment.has_google_update_experiment_id()) {
     const VariationID variation_id =
         static_cast<VariationID>(experiment.google_update_experiment_id());
     AssociateGoogleVariationIDForce(GOOGLE_UPDATE_SERVICE,
                                     trial_name,
                                     experiment.name(),
                                     variation_id);
   }
 }
 
+void ApplyUIStringOverrides(

[Alexei Svitkine (slow), 2014/07/04 15:48:51]

Add a comment please.

[jwd, 2014/07/07 15:52:20]

Done.

+    const Study_Experiment& experiment,
+    const VariationsSeedProcessor::UIStringOverrideCallback& override_string) {
+  for (int i = 0; i < experiment.override_ui_string_size(); ++i) {
+    Study_Experiment_OverrideUIString  experiment_overrides =

[Alexei Svitkine (slow), 2014/07/03 17:54:40]

Nit: Remove extra space.

[jwd, 2014/07/07 15:52:20]

Done.

+        experiment.override_ui_string(i);
+    override_string.Run(experiment_overrides.name_hash(),
+                        base::ASCIIToUTF16(experiment_overrides.value()));

[Alexei Svitkine (slow), 2014/07/03 17:54:41]

The value may not be ascii. Use UTF8ToUTF16.

[jwd, 2014/07/07 15:52:20]

Done.

+  }
+}
+
 }  // namespace
 
 VariationsSeedProcessor::VariationsSeedProcessor() {
 }
 
 VariationsSeedProcessor::~VariationsSeedProcessor() {
 }
 
 void VariationsSeedProcessor::CreateTrialsFromSeed(
     const VariationsSeed& seed,
     const std::string& locale,
     const base::Time& reference_date,
     const base::Version& version,
     Study_Channel channel,
     Study_FormFactor form_factor,
-    const std::string& hardware_class) {
+    const std::string& hardware_class,
+    const UIStringOverrideCallback& override_string) {
   std::vector<ProcessedStudy> filtered_studies;
   FilterAndValidateStudies(seed, locale, reference_date, version, channel,
                            form_factor, hardware_class, &filtered_studies);
 
   for (size_t i = 0; i < filtered_studies.size(); ++i)
-    CreateTrialFromStudy(filtered_studies[i]);
+    CreateTrialFromStudy(filtered_studies[i], override_string);
 }
 
 void VariationsSeedProcessor::CreateTrialFromStudy(
-    const ProcessedStudy& processed_study) {
+    const ProcessedStudy& processed_study,
+    const UIStringOverrideCallback& override_string) {
   const Study& study = *processed_study.study();
 
   // 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())) {
       scoped_refptr<base::FieldTrial> trial(
           base::FieldTrialList::CreateFieldTrial(study.name(),
                                                  experiment.name()));
       RegisterExperimentParams(study, experiment);
       RegisterVariationIds(experiment, study.name());
-      if (study.activation_type() == Study_ActivationType_ACTIVATION_AUTO)
+      if (study.activation_type() == Study_ActivationType_ACTIVATION_AUTO) {
         trial->group();
+        // UI Strings can only be overridden from ACTIVATION_AUTO experiments.
+        ApplyUIStringOverrides(experiment, override_string);
+      }
 
       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;
@@ skipping 23 matching lines @@
     if (experiment.has_forcing_flag())
       continue;
 
     if (experiment.name() != study.default_experiment_name())
       trial->AppendGroup(experiment.name(), experiment.probability_weight());
 
     RegisterVariationIds(experiment, study.name());
   }
 
   trial->SetForced();
   if (processed_study.is_expired())

[Alexei Svitkine (slow), 2014/07/04 15:48:51]

Nit: Add {}'s here.

[jwd, 2014/07/07 15:52:20]

Done.

     trial->Disable();
-  else if (study.activation_type() == Study_ActivationType_ACTIVATION_AUTO)
-    trial->group();
+  else if (study.activation_type() == Study_ActivationType_ACTIVATION_AUTO) {
+    const std::string& group_name = trial->group_name();
+
+    // UI Strings can only be overridden from ACTIVATION_AUTO experiments.
+    int experiment_index = processed_study.GetExperimentIndexByName(group_name);

[Alexei Svitkine (slow), 2014/07/04 15:48:51]

Maybe add a bool to keep track if any experiment had UI string overrides (via
the loop above) and do an early return if they haven't - to avoid this extra
work unless necessary.

[jwd, 2014/07/07 15:52:20]

Done.

+
+    // The field trial was defined from |study|, so the active experiment's name
+    // must be in the |study|.
+    DCHECK_GE(experiment_index, 0);

[Alexei Svitkine (slow), 2014/07/04 15:48:52]

Change to NE(-1, 

[jwd, 2014/07/07 15:52:20]

Done.

+
+    ApplyUIStringOverrides(study.experiment(experiment_index), override_string);
+  }
 }
 
 }  // namespace chrome_variations