Omnibox - Add About Flag to Reverse Title and URLs in the Dropdown

components/omnibox/autocomplete_result_unittest.cc

 // Copyright 2014 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 "components/omnibox/autocomplete_result.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 189 matching lines @@
     const TestData* expected, size_t expected_size) {
   AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::INVALID_SPEC, false, false, false,
                           true,
                           TestSchemeClassifier());
 
   ACMatches last_matches;
   PopulateAutocompleteMatches(last, last_size, &last_matches);
   AutocompleteResult last_result;
-  last_result.AppendMatches(last_matches);
+  last_result.AppendMatches(input, last_matches);
   last_result.SortAndCull(input, template_url_service_.get());
 
   ACMatches current_matches;
   PopulateAutocompleteMatches(current, current_size, &current_matches);
   AutocompleteResult current_result;
-  current_result.AppendMatches(current_matches);
+  current_result.AppendMatches(input, current_matches);
   current_result.SortAndCull(input, template_url_service_.get());
   current_result.CopyOldMatches(
       input, last_result, template_url_service_.get());
 
   AssertResultMatches(current_result, expected, expected_size);
 }
 
 // Assertion testing for AutocompleteResult::Swap.
 TEST_F(AutocompleteResultTest, Swap) {
   AutocompleteResult r1;
   AutocompleteResult r2;
 
   // Swap with empty shouldn't do anything interesting.
   r1.Swap(&r2);
   EXPECT_EQ(r1.end(), r1.default_match());
   EXPECT_EQ(r2.end(), r2.default_match());
 
   // Swap with a single match.
   ACMatches matches;
   AutocompleteMatch match;
   match.relevance = 1;
   match.allowed_to_be_default_match = true;
   AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::INVALID_SPEC, false, false, false,
                           true, TestSchemeClassifier());
   matches.push_back(match);
-  r1.AppendMatches(matches);
+  r1.AppendMatches(input, matches);
   r1.SortAndCull(input, template_url_service_.get());
   EXPECT_EQ(r1.begin(), r1.default_match());
   EXPECT_EQ("http://a/", r1.alternate_nav_url().spec());
   r1.Swap(&r2);
   EXPECT_TRUE(r1.empty());
   EXPECT_EQ(r1.end(), r1.default_match());
   EXPECT_TRUE(r1.alternate_nav_url().is_empty());
   ASSERT_FALSE(r2.empty());
   EXPECT_EQ(r2.begin(), r2.default_match());
   EXPECT_EQ("http://a/", r2.alternate_nav_url().spec());
@@ skipping 112 matching lines @@
     { 0, 1, 1300, true },
     { 0, 1, 1200, true },
   };
 
   ACMatches matches;
   PopulateAutocompleteMatches(data, arraysize(data), &matches);
   matches[1].destination_url = GURL();
   matches[3].destination_url = GURL();
   matches[4].destination_url = GURL();
 
-  AutocompleteResult result;
-  result.AppendMatches(matches);
   AutocompleteInput input(base::string16(), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::INVALID_SPEC, false, false, false,
                           true,
                           TestSchemeClassifier());
+  AutocompleteResult result;
+  result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
   // Of the two results with the same non-empty destination URL, the
   // lower-relevance one should be dropped.  All of the results with empty URLs
   // should be kept.
   ASSERT_EQ(4U, result.size());
   EXPECT_TRUE(result.match_at(0)->destination_url.is_empty());
   EXPECT_EQ(1300, result.match_at(0)->relevance);
   EXPECT_TRUE(result.match_at(1)->destination_url.is_empty());
   EXPECT_EQ(1200, result.match_at(1)->relevance);
@@ skipping 20 matching lines @@
   };
 
   ACMatches matches;
   PopulateAutocompleteMatches(data, arraysize(data), &matches);
   matches[0].destination_url = GURL("http://www.foo.com/s?q=foo");
   matches[1].destination_url = GURL("http://www.foo.com/s?q=foo2");
   matches[2].destination_url = GURL("http://www.foo.com/s?q=foo&oq=f");
   matches[3].destination_url = GURL("http://www.foo.com/s?q=foo&aqs=0");
   matches[4].destination_url = GURL("http://www.foo.com/");
 
-  AutocompleteResult result;
-  result.AppendMatches(matches);
   AutocompleteInput input(base::string16(), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::INVALID_SPEC, false, false, false,
                           true,
                           TestSchemeClassifier());
+  AutocompleteResult result;
+  result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
   // We expect the 3rd and 4th results to be removed.
   ASSERT_EQ(3U, result.size());
   EXPECT_EQ("http://www.foo.com/s?q=foo",
             result.match_at(0)->destination_url.spec());
   EXPECT_EQ(1300, result.match_at(0)->relevance);
   EXPECT_EQ("http://www.foo.com/s?q=foo2",
             result.match_at(1)->destination_url.spec());
   EXPECT_EQ(1200, result.match_at(1)->relevance);
@@ skipping 26 matching lines @@
 
   ACMatches matches;
   PopulateAutocompleteMatches(data, arraysize(data), &matches);
   matches[0].destination_url = GURL("http://www.foo.com/s?q=foo");
   matches[1].destination_url = GURL("http://www.foo.com/s?q=foo2");
   matches[2].destination_url = GURL("http://www.foo.com/s?q=foo&oq=f");
   matches[3].destination_url = GURL("http://www.foo.com/s?q=foo&aqs=0");
   matches[4].destination_url = GURL("http://www.foo.com/");
   matches[5].destination_url = GURL("http://www.foo.com/s?q=foo2&oq=f");
 
-  AutocompleteResult result;
-  result.AppendMatches(matches);
   AutocompleteInput input(base::string16(), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::INVALID_SPEC, false, false, false,
                           true,
                           TestSchemeClassifier());
+  AutocompleteResult result;
+  result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
   // Expect 3 unique results after SortAndCull().
   ASSERT_EQ(3U, result.size());
 
   // Check that 3rd and 4th result got added to the first result as dups
   // and also duplicates of the 4th match got copied.
   ASSERT_EQ(4U, result.match_at(0)->duplicate_matches.size());
   const AutocompleteMatch* first_match = result.match_at(0);
   EXPECT_EQ(matches[2].destination_url,
@@ skipping 28 matching lines @@
   {
     std::map<std::string, std::string> params;
     params[std::string(OmniboxFieldTrial::kDemoteByTypeRule) + ":3:*"] =
         "1:50,7:100,2:0";  // 3 == HOME_PAGE
     ASSERT_TRUE(variations::AssociateVariationParams(
         OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
   }
   base::FieldTrialList::CreateFieldTrial(
       OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
 
-  AutocompleteResult result;
-  result.AppendMatches(matches);
   AutocompleteInput input(base::string16(), base::string16::npos,
                           std::string(), GURL(),
                           OmniboxEventProto::HOME_PAGE, false, false, false,
                           true,
                           TestSchemeClassifier());
+  AutocompleteResult result;
+  result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
   // Check the new ordering.  The history-title results should be omitted.
   // We cannot check relevance scores because the matches are sorted by
   // demoted relevance but the actual relevance scores are not modified.
   ASSERT_EQ(3u, result.size());
   EXPECT_EQ("http://search-what-you-typed/",
             result.match_at(0)->destination_url.spec());
   EXPECT_EQ("http://history-url/",
             result.match_at(1)->destination_url.spec());
@@ skipping 19 matching lines @@
     std::map<std::string, std::string> params;
     params[std::string(OmniboxFieldTrial::kDemoteByTypeRule) + ":8:*"] =
         "1:50";  // 8 == INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS
     ASSERT_TRUE(variations::AssociateVariationParams(
         OmniboxFieldTrial::kBundledExperimentFieldTrialName, "C", params));
   }
   base::FieldTrialList::CreateFieldTrial(
       OmniboxFieldTrial::kBundledExperimentFieldTrialName, "C");
 
   {
-    AutocompleteResult result;
-    result.AppendMatches(matches);
     AutocompleteInput input(
         base::string16(), base::string16::npos, std::string(), GURL(),
         OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false,
         false, false, true,
         TestSchemeClassifier());
+    AutocompleteResult result;
+    result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
 
     // The NAVSUGGEST dup-url stay above search-url since the navsuggest
     // variant should not be demoted.
     ASSERT_EQ(4u, result.size());
     EXPECT_EQ("http://search-what-you-typed/",
               result.match_at(0)->destination_url.spec());
     EXPECT_EQ("http://dup-url/",
               result.match_at(1)->destination_url.spec());
     EXPECT_EQ(AutocompleteMatchType::NAVSUGGEST,
@@ skipping 12 matching lines @@
     { 2, 1, 1100, true },
     { 3, 1, 1000, true }
   };
 
   {
     // Check that reorder doesn't do anything if the top result
     // is already a legal default match (which is the default from
     // PopulateAutocompleteMatches()).
     ACMatches matches;
     PopulateAutocompleteMatches(data, arraysize(data), &matches);
-    AutocompleteResult result;
-    result.AppendMatches(matches);
     AutocompleteInput input(base::string16(), base::string16::npos,
                             std::string(), GURL(),
                             OmniboxEventProto::HOME_PAGE, false, false, false,
                             true,
                             TestSchemeClassifier());
+    AutocompleteResult result;
+    result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
     AssertResultMatches(result, data, 4);
   }
 
   {
     // Check that reorder swaps up a result appropriately.
     ACMatches matches;
     PopulateAutocompleteMatches(data, arraysize(data), &matches);
     matches[0].allowed_to_be_default_match = false;
     matches[1].allowed_to_be_default_match = false;
-    AutocompleteResult result;
-    result.AppendMatches(matches);
     AutocompleteInput input(base::string16(), base::string16::npos,
                             std::string(), GURL(),
                             OmniboxEventProto::HOME_PAGE, false, false, false,
                             true,
                             TestSchemeClassifier());
+    AutocompleteResult result;
+    result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
     ASSERT_EQ(4U, result.size());
     EXPECT_EQ("http://c/", result.match_at(0)->destination_url.spec());
     EXPECT_EQ("http://a/", result.match_at(1)->destination_url.spec());
     EXPECT_EQ("http://b/", result.match_at(2)->destination_url.spec());
     EXPECT_EQ("http://d/", result.match_at(3)->destination_url.spec());
   }
 }
 
 TEST_F(AutocompleteResultTest, ShouldHideTopMatch) {
   base::FieldTrialList::CreateFieldTrial("InstantExtended",
                                          "Group1 hide_verbatim:1");
   ACMatches matches;
 
   // Case 1: Top match is a verbatim match.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &matches);
   AutocompleteResult result;
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_TRUE(result.ShouldHideTopMatch());
   matches.clear();
   result.Reset();
 
   // Case 2: If the verbatim first match is followed by another verbatim match,
   // don't hide the top verbatim match.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
   matches.clear();
   result.Reset();
 
   // Case 3: Top match is not a verbatim match. Do not hide the top match.
   PopulateAutocompleteMatchesFromTestData(kNonVerbatimMatches, 1, &matches);
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }
 
 TEST_F(AutocompleteResultTest, ShouldHideTopMatchAfterCopy) {
   base::FieldTrialList::CreateFieldTrial("InstantExtended",
                                          "Group1 hide_verbatim:1");
   ACMatches matches;
 
   // Case 1: Top match is a verbatim match followed by only copied matches.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
   for (size_t i = 1; i < arraysize(kVerbatimMatches); ++i)
     matches[i].from_previous = true;
   AutocompleteResult result;
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_TRUE(result.ShouldHideTopMatch());
   result.Reset();
 
   // Case 2: The copied matches are then followed by a non-verbatim match.
   PopulateAutocompleteMatchesFromTestData(kNonVerbatimMatches, 1, &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_TRUE(result.ShouldHideTopMatch());
   result.Reset();
 
   // Case 3: The copied matches are instead followed by a verbatim match.
   matches.back().from_previous = true;
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }
 
 TEST_F(AutocompleteResultTest, DoNotHideTopMatch_FieldTrialFlagDisabled) {
   // This test config is identical to ShouldHideTopMatch test ("Case 1") except
   // that the "hide_verbatim" flag is disabled in the field trials.
   base::FieldTrialList::CreateFieldTrial("InstantExtended",
                                          "Group1 hide_verbatim:0");
   ACMatches matches;
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &matches);
   AutocompleteResult result;
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   // Field trial flag "hide_verbatim" is disabled. Do not hide top match.
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }
 
 TEST_F(AutocompleteResultTest, TopMatchIsStandaloneVerbatimMatch) {
   ACMatches matches;
   AutocompleteResult result;
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
 
   // Case 1: Result set is empty.
   EXPECT_FALSE(result.TopMatchIsStandaloneVerbatimMatch());
 
   // Case 2: Top match is not a verbatim match.
   PopulateAutocompleteMatchesFromTestData(kNonVerbatimMatches, 1, &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_FALSE(result.TopMatchIsStandaloneVerbatimMatch());
   result.Reset();
   matches.clear();
 
   // Case 3: Top match is a verbatim match.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_TRUE(result.TopMatchIsStandaloneVerbatimMatch());
   result.Reset();
   matches.clear();
 
   // Case 4: Standalone verbatim match found in AutocompleteResult.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &matches);
   PopulateAutocompleteMatchesFromTestData(kNonVerbatimMatches, 1, &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_TRUE(result.TopMatchIsStandaloneVerbatimMatch());
   result.Reset();
   matches.clear();
 
   // Case 5: Multiple verbatim matches found in AutocompleteResult.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches,
                                           arraysize(kVerbatimMatches),
                                           &matches);
-  result.AppendMatches(matches);
+  result.AppendMatches(AutocompleteInput(), matches);
   EXPECT_FALSE(result.ShouldHideTopMatch());
 }