[Cleanup] Remove some expired omnibox field trials.

components/omnibox/browser/omnibox_field_trial.cc

Index: components/omnibox/browser/omnibox_field_trial.cc
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
index 3dd7f4e746e775ec1e8772535a57ba1aec0ea452..5270c2f4fd15b8e37a7c9dee6d2c77d5da6cb5bc 100644
--- a/components/omnibox/browser/omnibox_field_trial.cc
+++ b/components/omnibox/browser/omnibox_field_trial.cc
@@ -29,23 +29,6 @@ namespace {
 typedef std::map<std::string, std::string> VariationParams;
 typedef HUPScoringParams::ScoreBuckets ScoreBuckets;
 
-// Field trial names.
-const char kStopTimerFieldTrialName[] = "OmniboxStopTimer";
-
-// The autocomplete dynamic field trial name prefix.  Each field trial is
-// configured dynamically and is retrieved automatically by Chrome during
-// the startup.
-const char kAutocompleteDynamicFieldTrialPrefix[] = "AutocompleteDynamicTrial_";
-// The maximum number of the autocomplete dynamic field trials (aka layers).
-const int kMaxAutocompleteDynamicFieldTrials = 5;
-
-
-// Concatenates the autocomplete dynamic field trial prefix with a field trial
-// ID to form a complete autocomplete field trial name.
-std::string DynamicFieldTrialName(int id) {
-  return base::StringPrintf("%s%d", kAutocompleteDynamicFieldTrialPrefix, id);
-}
-
 void InitializeBucketsFromString(const std::string& bucket_string,
                                  ScoreBuckets* score_buckets) {
   // Clear the buckets.
@@ -123,13 +106,6 @@ double HUPScoringParams::ScoreBuckets::HalfLifeTimeDecay(
   return pow(2.0, -half_life_intervals);
 }
 
-void OmniboxFieldTrial::ActivateDynamicTrials() {
-  // Initialize all autocomplete dynamic field trials.  This method may be
-  // called multiple times.
-  for (int i = 0; i < kMaxAutocompleteDynamicFieldTrials; ++i)
-    base::FieldTrialList::FindValue(DynamicFieldTrialName(i));
-}
-
 int OmniboxFieldTrial::GetDisabledProviderTypes() {
   const std::string& types_string = variations::GetVariationParamValue(
       kBundledExperimentFieldTrialName,
@@ -141,29 +117,6 @@ int OmniboxFieldTrial::GetDisabledProviderTypes() {
   return types;
 }
 
-void OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(

[Mark P, 2016/01/14 05:31:02]

The last part of this function still needs to remain because of the
kBundledExperimentFieldTrialName, which is currently in use.  The dynamic stuff
can go.

[Ilya Sherman, 2016/01/14 05:40:41]

Whoops!  Thanks for catching that.

-    std::vector<uint32_t>* field_trial_hashes) {
-  field_trial_hashes->clear();
-  for (int i = 0; i < kMaxAutocompleteDynamicFieldTrials; ++i) {
-    const std::string& trial_name = DynamicFieldTrialName(i);
-    if (base::FieldTrialList::TrialExists(trial_name))
-      field_trial_hashes->push_back(metrics::HashName(trial_name));
-  }
-  if (base::FieldTrialList::TrialExists(kBundledExperimentFieldTrialName)) {
-    field_trial_hashes->push_back(
-        metrics::HashName(kBundledExperimentFieldTrialName));
-  }
-}
-
-base::TimeDelta OmniboxFieldTrial::StopTimerFieldTrialDuration() {

[Mark P, 2016/01/14 05:31:02]

I'd prefer is this trial remains.

[Ilya Sherman, 2016/01/14 05:40:41]

Done.

-  int stop_timer_ms;
-  if (base::StringToInt(
-      base::FieldTrialList::FindFullName(kStopTimerFieldTrialName),
-          &stop_timer_ms))
-    return base::TimeDelta::FromMilliseconds(stop_timer_ms);
-  return base::TimeDelta::FromMilliseconds(1500);
-}
-
 bool OmniboxFieldTrial::InZeroSuggestFieldTrial() {
   if (variations::GetVariationParamValue(
           kBundledExperimentFieldTrialName, kZeroSuggestRule) == "true")