Index: chrome/browser/search/search_unittest.cc |
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc |
index 489cba81578344ef35b0eabc7e83cb6ce336fd10..a8710dc745a692f8fac7514183fd4509b057ed9c 100644 |
--- a/chrome/browser/search/search_unittest.cc |
+++ b/chrome/browser/search/search_unittest.cc |
@@ -946,68 +946,4 @@ TEST_F(DisplaySearchButtonTest, InvalidValue) { |
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) { |
- base::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) { |
- base::CommandLine::ForCurrentProcess()->AppendSwitch( |
- switches::kEnableOriginChipAlways); |
- EXPECT_TRUE(ShouldDisplayOriginChip()); |
- EXPECT_EQ(ORIGIN_CHIP_ALWAYS, GetOriginChipCondition()); |
-} |
- |
-TEST_F(OriginChipTest, CommandLineOnSrp) { |
- base::CommandLine::ForCurrentProcess()->AppendSwitch( |
- switches::kEnableOriginChipOnSrp); |
- EXPECT_TRUE(ShouldDisplayOriginChip()); |
- EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition()); |
-} |
- |
} // namespace chrome |