Don't demote top match for certain match types.

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 136 matching lines @@
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
     i->ComputeStrippedDestinationURL(profile);
 
   // Remove duplicates.
   std::sort(matches_.begin(), matches_.end(),
             &AutocompleteMatch::DestinationSortFunc);
   matches_.erase(std::unique(matches_.begin(), matches_.end(),
                              &AutocompleteMatch::DestinationsEqual),
                  matches_.end());
 
+  // Don't demote the top match if applicable.
+  OmniboxFieldTrial::UndemotableTopMatchTypes undemotable_top_types;
+  OmniboxFieldTrial::GetUndemotableTopTypes(input.current_page_classification(),
+                                            &undemotable_top_types);
+  const bool preserve_top_match = !matches_.empty() &&
+      (undemotable_top_types.find(matches_.begin()->type) !=

[Peter Kasting, 2013/11/05 04:09:55]

Nit: Instead of using find(), use count() and check for the result being
nonzero.

[H Fung, 2013/11/05 06:11:27]

Done.  Actually, should ContainsKey() be used instead?  I won't do it now since
I don't see it used too often and might commit this change soon.

[Peter Kasting, 2013/11/05 20:00:34]

From stl_util.h?  I don't really know why we have that -- it's not particularly
shorter, less complicated, or more efficient than using count().  We should
probably just remove that.

The only advantage I could see would be if this supports more containers than
expose count(), and thus makes code a bit more "type-agnostic" in case the
container type is changed later.

+       undemotable_top_types.end());
+
   // Sort and trim to the most relevant kMaxMatches matches.
   size_t max_num_matches = std::min(kMaxMatches, matches_.size());
   CompareWithDemoteByType comparing_object(input.current_page_classification());
-  std::sort(matches_.begin(), matches_.end(), comparing_object);
+  std::sort(preserve_top_match ? matches_.begin() + 1 : matches_.begin(),

[Peter Kasting, 2013/11/05 04:09:55]

Nit: Slightly briefer: matches.begin() + (preserve_top_match ? 1 : 0)

[H Fung, 2013/11/05 06:11:27]

Done.

+            matches_.end(), comparing_object);
   if (!matches_.empty() && !matches_.begin()->allowed_to_be_default_match &&
       OmniboxFieldTrial::ReorderForLegalDefaultMatch(
           input.current_page_classification())) {
     // Top match is not allowed to be the default match.  Find the most
     // relevant legal match and shift it to the front.
     for (AutocompleteResult::iterator it = matches_.begin() + 1;
          it != matches_.end(); ++it) {
       if (it->allowed_to_be_default_match) {
         std::rotate(matches_.begin(), it, it + 1);
         break;
@@ skipping 138 matching lines @@
   alternate_nav_url_ = rhs.alternate_nav_url_;
 }
 
 void AutocompleteResult::AddMatch(
     AutocompleteInput::PageClassification page_classification,
     const AutocompleteMatch& match) {
   DCHECK(default_match_ != end());
   DCHECK_EQ(AutocompleteMatch::SanitizeString(match.contents), match.contents);
   DCHECK_EQ(AutocompleteMatch::SanitizeString(match.description),
             match.description);
+  // GetUndemotableTopTypes() is not used here because it's done in
+  // SortAndCull(), and we depend on SortAndCull() to be called afterwards.
   CompareWithDemoteByType comparing_object(page_classification);
   ACMatches::iterator insertion_point =
       std::upper_bound(begin(), end(), match, comparing_object);
   matches_difference_type default_offset = default_match_ - begin();
   if ((insertion_point - begin()) <= default_offset)
     ++default_offset;
   matches_.insert(insertion_point, match);
   default_match_ = begin() + default_offset;
 }
 
@@ skipping 33 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--;
     }
   }
 }