Remove search::ShouldAllowPrefetchNonDefaultMatch

chrome/browser/ui/omnibox/chrome_omnibox_client.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 "chrome/browser/ui/omnibox/chrome_omnibox_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 42 matching lines @@
 
 using predictors::AutocompleteActionPredictor;
 
 namespace {
 
 // Returns the AutocompleteMatch that the InstantController should prefetch, if
 // any.
 //
 // The SearchProvider may mark some suggestions to be prefetched based on
 // instructions from the suggest server. If such a match ranks sufficiently
-// highly or if kAllowPrefetchNonDefaultMatch field trial is enabled, we'll
-// return it.
+// highly, we'll return it.
 //
-// If the kAllowPrefetchNonDefaultMatch field trial is enabled we return the
-// prefetch suggestion even if it is not the default match. Otherwise we only
-// care about matches that are the default or the second entry in the dropdown
-// (which can happen for non-default matches when a top verbatim match is
-// shown); for other matches, we think the likelihood of the user selecting
+// We only care about matches that are the default or the second entry in the
+// dropdown (which can happen for non-default matches when a top verbatim match
+// is shown); for other matches, we think the likelihood of the user selecting
 // them is low enough that prefetching isn't worth doing.
 const AutocompleteMatch* GetMatchToPrefetch(const AutocompleteResult& result) {
-  if (search::ShouldAllowPrefetchNonDefaultMatch()) {
-    const AutocompleteResult::const_iterator prefetch_match = std::find_if(
-        result.begin(), result.end(), SearchProvider::ShouldPrefetch);
-    return prefetch_match != result.end() ? &(*prefetch_match) : NULL;
-  }
-
   // If the default match should be prefetched, do that.
   const auto default_match = result.default_match();
   if ((default_match != result.end()) &&
       SearchProvider::ShouldPrefetch(*default_match))
     return &(*default_match);
 
   // Otherwise, if the top match is a verbatim match and the very next match
   // is prefetchable, fetch that.
   if (result.TopMatchIsStandaloneVerbatimMatch() && (result.size() > 1) &&
       SearchProvider::ShouldPrefetch(result.match_at(1)))
@@ skipping 178 matching lines @@
     return;
   SearchTabHelper::FromWebContents(
       controller_->GetWebContents())->OmniboxFocusChanged(state, reason);
 }
 
 void ChromeOmniboxClient::OnResultChanged(
     const AutocompleteResult& result,
     bool default_match_changed,
     const base::Callback<void(const SkBitmap& bitmap)>& on_bitmap_fetched) {
   if (search::IsInstantExtendedAPIEnabled() &&
-      ((default_match_changed && result.default_match() != result.end()) ||
-       (search::ShouldAllowPrefetchNonDefaultMatch() && !result.empty()))) {
+      (default_match_changed && result.default_match() != result.end())) {
     InstantSuggestion prefetch_suggestion;
     const AutocompleteMatch* match_to_prefetch = GetMatchToPrefetch(result);
     if (match_to_prefetch) {
       prefetch_suggestion.text = match_to_prefetch->contents;
       prefetch_suggestion.metadata =
           SearchProvider::GetSuggestMetadata(*match_to_prefetch);
     }
     // Send the prefetch suggestion unconditionally to the InstantPage. If
     // there is no suggestion to prefetch, we need to send a blank query to
     // clear the prefetched results.
@@ skipping 179 matching lines @@
     if (prerenderer)
       prerenderer->Prerender(suggestion);
   }
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }