From 1c28401c698ce3240dc83010b58021fd1ef5f3e6 Mon Sep 17 00:00:00 2001 From: dschuyler Date: Wed, 10 Jun 2015 12:22:23 -0700 Subject: Remove ShouldHideTopMatch BUG=492452 Review URL: https://codereview.chromium.org/1154063003 Cr-Commit-Position: refs/heads/master@{#333772} --- components/search/search.cc | 8 -------- components/search/search.h | 5 ----- components/search/search_unittest.cc | 32 -------------------------------- 3 files changed, 45 deletions(-) (limited to 'components/search') diff --git a/components/search/search.cc b/components/search/search.cc index c2d4b4e..9afd666 100644 --- a/components/search/search.cc +++ b/components/search/search.cc @@ -35,8 +35,6 @@ const uint64 kEmbeddedSearchEnabledVersion = 2; const uint64 kEmbeddedPageVersionDefault = 2; #endif -const char kHideVerbatimFlagName[] = "hide_verbatim"; - // Constants for the field trial name and group prefix. // Note in M30 and below this field trial was named "InstantExtended" and in // M31 was renamed to EmbeddedSearch for clarity and cleanliness. Since we @@ -145,10 +143,4 @@ bool GetBoolValueForFlagWithDefault(const std::string& flag, return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags); } -bool ShouldHideTopVerbatimMatch() { - FieldTrialFlags flags; - return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault( - kHideVerbatimFlagName, false, flags); -} - } // namespace chrome diff --git a/components/search/search.h b/components/search/search.h index 9558ee8..0a7a55b 100644 --- a/components/search/search.h +++ b/components/search/search.h @@ -55,11 +55,6 @@ bool GetBoolValueForFlagWithDefault(const std::string& flag, bool default_value, const FieldTrialFlags& flags); -// Returns true if 'hide_verbatim' flag is enabled in field trials -// to hide the top match in the native suggestions dropdown if it is a verbatim -// match. See comments on ShouldHideTopMatch in autocomplete_result.h. -bool ShouldHideTopVerbatimMatch(); - } // namespace chrome #endif // COMPONENTS_SEARCH_SEARCH_H_ diff --git a/components/search/search_unittest.cc b/components/search/search_unittest.cc index d3bd873..2fd5a23 100644 --- a/components/search/search_unittest.cc +++ b/components/search/search_unittest.cc @@ -130,36 +130,4 @@ TEST_F(EmbeddedSearchFieldTrialTest, GetFieldTrialInfoControlFlags) { EXPECT_EQ(3ul, flags.size()); } -typedef EmbeddedSearchFieldTrialTest ShouldHideTopVerbatimTest; - -TEST_F(ShouldHideTopVerbatimTest, DoNotHideByDefault) { - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", - "Control")); - EXPECT_FALSE(ShouldHideTopVerbatimMatch()); -} - -TEST_F(ShouldHideTopVerbatimTest, DoNotHideInInstantExtended) { - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", - "Group1")); - EXPECT_FALSE(ShouldHideTopVerbatimMatch()); -} - -TEST_F(ShouldHideTopVerbatimTest, EnableByFlagInInstantExtended) { - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", - "Group1 hide_verbatim:1")); - EXPECT_TRUE(ShouldHideTopVerbatimMatch()); -} - -TEST_F(ShouldHideTopVerbatimTest, EnableByFlagOutsideInstantExtended) { - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( - "EmbeddedSearch", "Controll1 hide_verbatim:1")); - EXPECT_TRUE(ShouldHideTopVerbatimMatch()); -} - -TEST_F(ShouldHideTopVerbatimTest, DisableByFlag) { - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", - "Group1 hide_verbatim:0")); - EXPECT_FALSE(ShouldHideTopVerbatimMatch()); -} - } // namespace chrome -- cgit v1.1