removing ShouldHideTopMatch

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 629 matching lines @@
     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(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(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(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(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(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(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(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(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(AutocompleteInput(), matches);
   EXPECT_FALSE(result.TopMatchIsStandaloneVerbatimMatch());
   result.Reset();
   matches.clear();
 
   // Case 3: Top match is a verbatim match.
   PopulateAutocompleteMatchesFromTestData(kVerbatimMatches, 1, &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(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(AutocompleteInput(), matches);
-  EXPECT_FALSE(result.ShouldHideTopMatch());
 }