| Index: chrome/browser/search/search_unittest.cc
|
| diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
|
| index b31ab05cb094507358e318101c58685966757108..3aca88224582875aae928155b80e952055fe9a01 100644
|
| --- a/chrome/browser/search/search_unittest.cc
|
| +++ b/chrome/browser/search/search_unittest.cc
|
| @@ -876,138 +876,4 @@ TEST_F(IsQueryExtractionEnabledTest, EnabledViaCommandLine) {
|
| EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
|
| }
|
|
|
| -typedef SearchTest DisplaySearchButtonTest;
|
| -
|
| -TEST_F(DisplaySearchButtonTest, NotSet) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, Never) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:0"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, CommandLineNever) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kDisableSearchButtonInOmnibox);
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
|
| -
|
| - // Command-line disable should override the field trial.
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:1"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, ForSearchTermReplacement) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:1"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, CommandLineForSearchTermReplacement) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableSearchButtonInOmniboxForStr);
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, ForSearchTermReplacementOrInputInProgress) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:2"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP,
|
| - GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest,
|
| - CommandLineForSearchTermReplacementOrInputInProgress) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableSearchButtonInOmniboxForStrOrIip);
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP,
|
| - GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, Always) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:3"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_ALWAYS, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, CommandLineAlways) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableSearchButtonInOmniboxAlways);
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_ALWAYS, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -TEST_F(DisplaySearchButtonTest, InvalidValue) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 display_search_button:4"));
|
| - EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
|
| -}
|
| -
|
| -typedef SearchTest OriginChipTest;
|
| -
|
| -TEST_F(OriginChipTest, NotSet) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2"));
|
| - EXPECT_FALSE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, Disabled) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 origin_chip:0"));
|
| - EXPECT_FALSE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, Always) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
|
| - EXPECT_TRUE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_ALWAYS, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, OnSrp) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 origin_chip:2"));
|
| - EXPECT_TRUE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, InvalidValue) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 origin_chip:3"));
|
| - EXPECT_FALSE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, CommandLineDisabled) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kDisableOriginChip);
|
| - EXPECT_FALSE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
|
| -
|
| - // Command-line disable should override the field trial.
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
|
| - EXPECT_FALSE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, CommandLineAlways) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableOriginChipAlways);
|
| - EXPECT_TRUE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_ALWAYS, GetOriginChipCondition());
|
| -}
|
| -
|
| -TEST_F(OriginChipTest, CommandLineOnSrp) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kEnableOriginChipOnSrp);
|
| - EXPECT_TRUE(ShouldDisplayOriginChip());
|
| - EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition());
|
| -}
|
| -
|
| } // namespace chrome
|
|
|