Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/autocomplete_provider_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
index 8b56cbb5e7581d82008831ef708e8f0dd0f26ab3..6307dab4d18001f231df395478af951b11599fe5 100644
--- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
@@ -128,6 +128,7 @@ void TestProvider::AddResultsWithSearchTermsArgs(
 
     match.fill_into_edit = prefix_ + UTF8ToUTF16(base::IntToString(i));
     match.destination_url = GURL(UTF16ToUTF8(match.fill_into_edit));
+    match.allowed_to_be_default_match = true;
 
     match.contents = match.fill_into_edit;
     match.contents_class.push_back(
@@ -345,6 +346,8 @@ void AutocompleteProviderTest::RunRedundantKeywordTest(
   ACMatches matches;
   for (size_t i = 0; i < size; ++i) {
     AutocompleteMatch match;
+    match.relevance = 1000;

[msw, 2013/08/07 20:09:21]

where does 1000 come from? why is it needed?

[Mark P, 2013/08/07 22:13:05]

It needs to be set to something because nowadays AutocompleteResult filters all
matches with 0 relevance.  1000 is arbitrary.  Added a comment.

+    match.allowed_to_be_default_match = true;
     match.fill_into_edit = match_data[i].fill_into_edit;
     match.transition = content::PAGE_TRANSITION_KEYWORD;
     match.keyword = match_data[i].keyword;
@@ -370,6 +373,7 @@ void AutocompleteProviderTest::RunAssistedQueryStatsTest(
   for (size_t i = 0; i < size; ++i) {
     AutocompleteMatch match(NULL, kMaxRelevance - i, false,
                             aqs_test_data[i].match_type);
+    match.allowed_to_be_default_match = true;
     match.keyword = ASCIIToUTF16(kTestTemplateURLKeyword);
     match.search_terms_args.reset(
         new TemplateURLRef::SearchTermsArgs(string16()));
@@ -509,9 +513,6 @@ TEST_F(AutocompleteProviderTest, ExtraQueryParams) {
 TEST_F(AutocompleteProviderTest, RedundantKeywordsIgnoredInResult) {
   ResetControllerWithKeywordProvider();
 
-  // Get the controller's internal members in the correct state.

[msw, 2013/08/07 20:09:21]

why is this no longer needed?

[Mark P, 2013/08/07 22:13:05]

It apparently was never needed (or at least not needed for a while).  I needed
to remove it here because this initial RunQuery() call results in a DCHECK
because the input doesn't trigger a keyword mode and this test never sets up a
default search provider, meaning there's no matches (and therefore no default
match).

-  RunQuery(ASCIIToUTF16("fo"));
-
   {
     KeywordTestData duplicate_url[] = {
       { ASCIIToUTF16("fo"), string16(), false },