Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / base / metrics / field_trial.h

diff --git a/src/base/metrics/field_trial.h b/src/base/metrics/field_trial.h
index 5a4375e..51177eb 100644 (file)
--- a/src/base/metrics/field_trial.h
+++ b/src/base/metrics/field_trial.h
@@ -55,6 +55,7 @@
 #define BASE_METRICS_FIELD_TRIAL_H_
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -412,9 +413,12 @@ class BASE_EXPORT FieldTrialList {
   // browser process into this non-browser process, but could also be invoked
   // through a command line argument to the browser process. The created field
   // trials are marked as "used" for the purposes of active trial reporting if
-  // |mode| is ACTIVATE_TRIALS.
-  static bool CreateTrialsFromString(const std::string& prior_trials,
-                                     FieldTrialActivationMode mode);
+  // |mode| is ACTIVATE_TRIALS. Trial names in |ignored_trial_names| are ignored
+  // when parsing |prior_trials|.
+  static bool CreateTrialsFromString(
+      const std::string& prior_trials,
+      FieldTrialActivationMode mode,
+      const std::set<std::string>& ignored_trial_names);
 
   // Create a FieldTrial with the given |name| and using 100% probability for
   // the FieldTrial, force FieldTrial to have the same group string as