Remove OmniboxHUPCullRedirects and OmniboxHUPCreateShorterMatch trials

chrome/browser/autocomplete/history_url_provider.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/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 460 matching lines @@
       search_terms_data(new SearchTermsDataSnapshot(search_terms_data)) {
 }
 
 HistoryURLProviderParams::~HistoryURLProviderParams() {
 }
 
 HistoryURLProvider::HistoryURLProvider(AutocompleteProviderListener* listener,
                                        Profile* profile)
     : HistoryProvider(profile, AutocompleteProvider::TYPE_HISTORY_URL),
       listener_(listener),
-      params_(NULL),
-      cull_redirects_(
-          !OmniboxFieldTrial::InHUPCullRedirectsFieldTrial() ||
-          !OmniboxFieldTrial::InHUPCullRedirectsFieldTrialExperimentGroup()),
-      create_shorter_match_(
-          !OmniboxFieldTrial::InHUPCreateShorterMatchFieldTrial() ||
-          !OmniboxFieldTrial::
-              InHUPCreateShorterMatchFieldTrialExperimentGroup()) {
+      params_(NULL) {
   // Initialize HUP scoring params based on the current experiment.
   OmniboxFieldTrial::GetExperimentalHUPScoringParams(&scoring_params_);
 }
 
 void HistoryURLProvider::Start(const AutocompleteInput& input,
                                bool minimal_changes) {
   // NOTE: We could try hard to do less work in the |minimal_changes| case
   // here; some clever caching would let us reuse the raw matches from the
   // history DB without re-querying.  However, we'd still have to go back to
   // the history thread to mark these up properly, and if pass 2 is currently
@@ skipping 317 matching lines @@
     params->promote_type = HistoryURLProviderParams::FRONT_HISTORY_MATCH;
   } else {
     // Failed to promote any URLs.  Use the What You Typed match, if we have it.
     params->promote_type = params->have_what_you_typed_match ?
         HistoryURLProviderParams::WHAT_YOU_TYPED_MATCH :
         HistoryURLProviderParams::NEITHER;
   }
 
   const size_t max_results =
       kMaxMatches + (params->exact_suggestion_is_in_history ? 1 : 0);
-  if (backend && cull_redirects_) {
+  if (backend) {
     // Remove redirects and trim list to size.  We want to provide up to
     // kMaxMatches results plus the What You Typed result, if it was added to
     // params->matches above.
     CullRedirects(backend, &params->matches, max_results);
   } else if (params->matches.size() > max_results) {
     // Simply trim the list to size.
     params->matches.resize(max_results);
   }
 }
 
@@ skipping 211 matching lines @@
     // Try to get info on the search base itself.  Promote it to the top if the
     // original best match isn't good enough to autocomplete.
     db->GetRowForURL(search_base, &info);
     promote = match.url_info.typed_count() <= 1;
   }
 
   // Promote or add the desired URL to the list of matches.
   const bool ensure_can_inline =
       promote && CanPromoteMatchForInlineAutocomplete(match);
   return CreateOrPromoteMatch(info, match.input_location, match.match_in_scheme,
-                              &params->matches, create_shorter_match_,
-                              promote) &&
+                              &params->matches, true, promote) &&
       ensure_can_inline;
 }
 
 void HistoryURLProvider::CullPoorMatches(
     HistoryURLProviderParams* params) const {
   const base::Time& threshold(history::AutocompleteAgeThreshold());
   for (history::HistoryMatches::iterator i(params->matches.begin());
        i != params->matches.end(); ) {
     if (RowQualifiesAsSignificant(i->url_info, threshold) &&
         (!params->default_search_provider ||
@@ skipping 123 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }