Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1211)

Unified Diff: chrome/browser/search/search_unittest.cc

Issue 266263002: [OriginChip] Add an option to display only on search result pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 8f18fc4a95d5f6e292f3436178ce78b6f42d57f5..374e961db44f956d68ead5a26031bd10f4aafede 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -1173,35 +1173,42 @@ TEST_F(OriginChipV2Test, NotSet) {
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2"));
EXPECT_FALSE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, Disabled) {
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2 origin_chip_v2:0"));
EXPECT_FALSE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, HideOnMouseRelease) {
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2 origin_chip_v2:1"));
EXPECT_TRUE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, HideOnUserInput) {
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2 origin_chip_v2:2"));
EXPECT_TRUE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, GetOriginChipV2Condition());
}
-TEST_F(OriginChipV2Test, InvalidValue) {
+TEST_F(OriginChipV2Test, OnSrp) {
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2 origin_chip_v2:3"));
+ EXPECT_TRUE(ShouldDisplayOriginChipV2());
+ EXPECT_EQ(ORIGIN_CHIP_V2_ON_SRP, GetOriginChipV2Condition());
+}
+
+TEST_F(OriginChipV2Test, InvalidValue) {
+ ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+ "EmbeddedSearch", "Group1 espv:2 origin_chip_v2:4"));
EXPECT_FALSE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, BothVersions) {
@@ -1212,34 +1219,41 @@ TEST_F(OriginChipV2Test, BothVersions) {
EXPECT_FALSE(ShouldDisplayOriginChip());
EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
EXPECT_TRUE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, CommandLineDisabled) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableOriginChipV2);
EXPECT_FALSE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2Condition());
// Command-line disable should override the field trial.
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"EmbeddedSearch", "Group1 espv:2 origin_chip_v2:1"));
EXPECT_FALSE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_DISABLED, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, CommandLineHideOnMouseRelease) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableOriginChipV2HideOnMouseRelease);
EXPECT_TRUE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE, GetOriginChipV2Condition());
}
TEST_F(OriginChipV2Test, CommandLineHideOnUserInput) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableOriginChipV2HideOnUserInput);
EXPECT_TRUE(ShouldDisplayOriginChipV2());
- EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, GetOriginChipV2HideTrigger());
+ EXPECT_EQ(ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, GetOriginChipV2Condition());
+}
+
+TEST_F(OriginChipV2Test, CommandLineOnSrp) {
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableOriginChipV2OnSrp);
+ EXPECT_TRUE(ShouldDisplayOriginChipV2());
+ EXPECT_EQ(ORIGIN_CHIP_V2_ON_SRP, GetOriginChipV2Condition());
}
} // namespace chrome
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698