Modified GetMatchToPrefetch() to return a valid match for prefetching even when hide_verbatim flag i

chrome/browser/autocomplete/autocomplete_result.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/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 240 matching lines @@
   DCHECK_LT(index, matches_.size());
   return matches_[index];
 }
 
 AutocompleteMatch* AutocompleteResult::match_at(size_t index) {
   DCHECK_LT(index, matches_.size());
   return &matches_[index];
 }
 
 bool AutocompleteResult::ShouldHideTopMatch() const {
   // Gate on our field trial flag.

[Peter Kasting, 2013/12/17 23:47:34]

Nit: Remove this comment.

[kmadhusu, 2013/12/18 23:26:08]

Done.

-  if (!chrome::ShouldHideTopVerbatimMatch())
-    return false;
+  return chrome::ShouldHideTopVerbatimMatch() &&
+      TopMatchIsVerbatimAndHasNoConsecutiveVerbatimMatches();
+}
 
-  // If we don't have a verbatim first match, show everything.
+bool AutocompleteResult::TopMatchIsVerbatimAndHasNoConsecutiveVerbatimMatches()

[Peter Kasting, 2013/12/17 23:47:34]

Nit: Name this TopMatchIsStandaloneVerbatimMatch() to shorten the name enough to
not have to wrap "const" to the next line.

[kmadhusu, 2013/12/18 23:26:08]

Done.

+    const {
   if (empty() || !match_at(0).IsVerbatimType())
     return false;
-
-  // If the verbatim first match is followed by another verbatim match, don't
-  // hide anything, lest we cause user confusion.
-  if ((size() > 1) && match_at(1).IsVerbatimType())
-    return false;
-
-  // Otherwise, it's safe to hide the verbatim first match.
-  return true;
+  return !(size() > 1) || !match_at(1).IsVerbatimType();

[Peter Kasting, 2013/12/17 23:47:34]

Nit: Simpler:

  return !empty() && match_at(0).IsVerbatimType() &&
      ((size() == 1) || !match_at(1).IsVerbatimType());

[kmadhusu, 2013/12/18 23:26:08]

Done.

 }
 
 void AutocompleteResult::Reset() {
   matches_.clear();
   default_match_ = end();
 }
 
 void AutocompleteResult::Swap(AutocompleteResult* other) {
   const size_t default_match_offset = default_match_ - begin();
   const size_t other_default_match_offset =
@@ skipping 90 matching lines @@
        i != old_matches.rend() && delta > 0; ++i) {
     if (!HasMatchByDestination(*i, new_matches)) {
       AutocompleteMatch match = *i;
       match.relevance = std::min(max_relevance, match.relevance);
       match.from_previous = true;
       AddMatch(page_classification, match);
       delta--;
     }
   }
 }