Omnibox: Better Enforce Suggest Relevance Constraints in Keyword Mode

chrome/browser/autocomplete/search_provider.h

Index: chrome/browser/autocomplete/search_provider.h
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index eb18fc2b27e967238cd4873398198f61a6f523ab..c09dad3550d84778ca5af2ea1597ce0b8856f7eb 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -251,9 +251,15 @@ class SearchProvider : public AutocompleteProvider,
 
   // Checks if suggested relevances violate certain expected constraints.
   // See UpdateMatches() for the use and explanation of these constraints.
-  bool IsTopMatchScoreTooLow() const;
-  bool IsTopMatchHighRankSearchForURL() const;
-  bool IsTopMatchNotInlinable() const;
+  // We pass in keyword_search_what_you_typed_relevance because it is not
+  // in |matches_| but can be important in testing these constraints if
+  // its high-ranked than the best result in |matches_|.
+  bool IsTopMatchScoreTooLow(
+      int keyword_search_what_you_typed_relevance) const;
+  bool IsTopMatchHighRankSearchForURL(
+      int keyword_search_what_you_typed_relevance) const;
+  bool IsTopMatchNotInlinable(
+      int keyword_search_what_you_typed_relevance) const;
 
   // Updates |matches_| from the latest results; applies calculated relevances
   // if suggested relevances cause undesriable behavior. Updates |done_|.