[Variations] Refactor all state used for study filtering into a container struct.

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 <stddef.h>
 
 #include <map>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/variations/client_filterable_state.h"
 #include "components/variations/processed_study.h"
 #include "components/variations/study_filtering.h"
 #include "components/variations/variations_associated_data.h"
 
 namespace variations {
 
 namespace {
 
 // Associates the variations params of |experiment|, if present.
 void RegisterExperimentParams(const Study& study,
@@ skipping 141 matching lines @@
 }  // 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& session_consistency_country,
-    const std::string& permanent_consistency_country,
+    const ClientFilterableState& client_state,
     const UIStringOverrideCallback& override_callback,
     const base::FieldTrial::EntropyProvider* low_entropy_provider,
     base::FeatureList* feature_list) {
   std::vector<ProcessedStudy> filtered_studies;
-  FilterAndValidateStudies(seed, locale, reference_date, version, channel,
-                           form_factor, hardware_class,
-                           session_consistency_country,
-                           permanent_consistency_country, &filtered_studies);
+  FilterAndValidateStudies(seed, client_state, &filtered_studies);
 
-  for (size_t i = 0; i < filtered_studies.size(); ++i)
+  for (size_t i = 0; i < filtered_studies.size(); ++i) {

[Alexei Svitkine (slow), 2017/06/07 15:18:08]

Nit: Change to C++11 for loop syntax if you're touching it already.

[Ilya Sherman, 2017/06/07 21:50:08]

Done.

     CreateTrialFromStudy(filtered_studies[i], override_callback,
                          low_entropy_provider, feature_list);
+  }
 }
 
 // static
 bool VariationsSeedProcessor::ShouldStudyUseLowEntropy(const Study& study) {
   for (int i = 0; i < study.experiment_size(); ++i) {
     const Study_Experiment& experiment = study.experiment(i);
     if (experiment.has_google_web_experiment_id() ||
         experiment.has_google_web_trigger_experiment_id() ||
         experiment.has_chrome_sync_experiment_id()) {
       return true;
@@ skipping 123 matching lines @@
     // Although not normally expected, but could happen in exception cases, see
     // tests: ExpiredStudy_NoDefaultGroup, ExistingFieldTrial_ExpiredByConfig
     if (experiment_index != -1) {
       ApplyUIStringOverrides(study.experiment(experiment_index),
                              override_callback);
     }
   }
 }
 
 }  // namespace variations