Remove OmniboxHUPCullRedirects and OmniboxHUPCreateShorterMatch trials

chrome/browser/omnibox/omnibox_field_trial.cc

 // Copyright (c) 2012 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 "chrome/browser/omnibox/omnibox_field_trial.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "components/variations/variations_associated_data.h"
 
 using metrics::OmniboxEventProto;
 
 namespace {
 
 typedef std::map<std::string, std::string> VariationParams;
 typedef HUPScoringParams::ScoreBuckets ScoreBuckets;
 
 // Field trial names.
-const char kHUPCullRedirectsFieldTrialName[] = "OmniboxHUPCullRedirects";
-const char kHUPCreateShorterMatchFieldTrialName[] =
-    "OmniboxHUPCreateShorterMatch";
 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;
 
-// Field trial experiment probabilities.
-
-// For HistoryURL provider cull redirects field trial, put 0% ( = 0/100 )
-// of the users in the don't-cull-redirects experiment group.
-// TODO(mpearson): Remove this field trial and the code it uses once I'm
-// sure it's no longer needed.
-const base::FieldTrial::Probability kHUPCullRedirectsFieldTrialDivisor = 100;
-const base::FieldTrial::Probability
-    kHUPCullRedirectsFieldTrialExperimentFraction = 0;
-
-// For HistoryURL provider create shorter match field trial, put 0%
-// ( = 25/100 ) of the users in the don't-create-a-shorter-match
-// experiment group.
-// TODO(mpearson): Remove this field trial and the code it uses once I'm
-// sure it's no longer needed.
-const base::FieldTrial::Probability
-    kHUPCreateShorterMatchFieldTrialDivisor = 100;
-const base::FieldTrial::Probability
-    kHUPCreateShorterMatchFieldTrialExperimentFraction = 0;
-
-// Field trial IDs.
-// Though they are not literally "const", they are set only once, in
-// ActivateStaticTrials() below.
-
-// Whether the static field trials have been initialized by
-// ActivateStaticTrials() method.
-bool static_field_trials_initialized = false;
-
-// Field trial ID for the HistoryURL provider cull redirects experiment group.
-int hup_dont_cull_redirects_experiment_group = 0;
-
-// Field trial ID for the HistoryURL provider create shorter match
-// experiment group.
-int hup_dont_create_shorter_match_experiment_group = 0;
-
 
 // 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 InitializeScoreBuckets(const VariationParams& params,
                             const char* relevance_cap_param,
                             const char* half_life_param,
@@ skipping 48 matching lines @@
   double time_ms;
   if ((half_life_days_ <= 0) ||
       ((time_ms = elapsed_time.InMillisecondsF()) <= 0))
     return 1.0;
 
   const double half_life_intervals =
       time_ms / base::TimeDelta::FromDays(half_life_days_).InMillisecondsF();
   return pow(2.0, -half_life_intervals);
 }
 
-void OmniboxFieldTrial::ActivateStaticTrials() {
-  DCHECK(!static_field_trials_initialized);
-
-  // Create the HistoryURL provider cull redirects field trial.
-  // Make it expire on March 1, 2013.
-  scoped_refptr<base::FieldTrial> trial(
-      base::FieldTrialList::FactoryGetFieldTrial(
-          kHUPCullRedirectsFieldTrialName, kHUPCullRedirectsFieldTrialDivisor,
-          "Standard", 2013, 3, 1, base::FieldTrial::ONE_TIME_RANDOMIZED, NULL));
-  hup_dont_cull_redirects_experiment_group =
-      trial->AppendGroup("DontCullRedirects",
-                         kHUPCullRedirectsFieldTrialExperimentFraction);
-
-  // Create the HistoryURL provider create shorter match field trial.
-  // Make it expire on March 1, 2013.
-  trial = base::FieldTrialList::FactoryGetFieldTrial(
-      kHUPCreateShorterMatchFieldTrialName,
-      kHUPCreateShorterMatchFieldTrialDivisor, "Standard", 2013, 3, 1,
-      base::FieldTrial::ONE_TIME_RANDOMIZED, NULL);
-  hup_dont_create_shorter_match_experiment_group =
-      trial->AppendGroup("DontCreateShorterMatch",
-                         kHUPCreateShorterMatchFieldTrialExperimentFraction);
-
-  static_field_trials_initialized = true;
-}
-
 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() {
   // Make sure that Autocomplete dynamic field trials are activated.  It's OK to
   // call this method multiple times.
@@ skipping 24 matching lines @@
     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));
   }
 }
 
-bool OmniboxFieldTrial::InHUPCullRedirectsFieldTrial() {
-  return base::FieldTrialList::TrialExists(kHUPCullRedirectsFieldTrialName);
-}
-
-bool OmniboxFieldTrial::InHUPCullRedirectsFieldTrialExperimentGroup() {
-  if (!base::FieldTrialList::TrialExists(kHUPCullRedirectsFieldTrialName))
-    return false;
-
-  // Return true if we're in the experiment group.
-  const int group = base::FieldTrialList::FindValue(
-      kHUPCullRedirectsFieldTrialName);
-  return group == hup_dont_cull_redirects_experiment_group;
-}
-
-bool OmniboxFieldTrial::InHUPCreateShorterMatchFieldTrial() {
-  return
-      base::FieldTrialList::TrialExists(kHUPCreateShorterMatchFieldTrialName);
-}
-
-bool OmniboxFieldTrial::InHUPCreateShorterMatchFieldTrialExperimentGroup() {
-  if (!base::FieldTrialList::TrialExists(kHUPCreateShorterMatchFieldTrialName))
-    return false;
-
-  // Return true if we're in the experiment group.
-  const int group = base::FieldTrialList::FindValue(
-      kHUPCreateShorterMatchFieldTrialName);
-  return group == hup_dont_create_shorter_match_experiment_group;
-}
-
 base::TimeDelta OmniboxFieldTrial::StopTimerFieldTrialDuration() {
   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() {
@@ skipping 270 matching lines @@
   if (it != params.end())
     return it->second;
   // Fall back to the global instant extended context.
   it = params.find(rule + ":" + page_classification_str + ":*");
   if (it != params.end())
     return it->second;
   // Look up rule in the global context.
   it = params.find(rule + ":*:*");
   return (it != params.end()) ? it->second : std::string();
 }