[OriginChip] Add options for the position of the origin chip.

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 49d15daa1399388c75c109af947049e1f8b119c8..25ae92f1ba4f652984e820296ade2d7e2dba1287 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -919,27 +919,80 @@ TEST_F(OriginChipTest, NoOriginChip) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:2 origin_chip:0"));
   EXPECT_FALSE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, OriginChipLeftOfLocationBar) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_LEFT_OF_LOCATION_BAR, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, OriginChipRightOfLocationBar) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 espv:2 origin_chip:2"));
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, OriginChipLeftOfMenu) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 espv:2 origin_chip:3"));
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_LEFT_OF_MENU, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, OriginChipInvalidValue) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch", "Group1 espv:2 origin_chip:4"));
+  EXPECT_FALSE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
 }
 
 TEST_F(OriginChipTest, CommandLineNoOriginChip) {
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableOriginChip);
   EXPECT_FALSE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
 
   // Command-line disable should override Finch.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
   EXPECT_FALSE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
 }
 
-TEST_F(OriginChipTest, OriginChip) {
+TEST_F(OriginChipTest, CommandLineOriginChip) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableOriginChip);
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR, GetOriginChipPosition());
+
+  // Command-line enable should override Finch.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
+      "EmbeddedSearch", "Group1 espv:2 origin_chip:0"));
   EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR, GetOriginChipPosition());
 }
 
-TEST_F(OriginChipTest, CommandLineOriginChip) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableOriginChip);
+TEST_F(OriginChipTest, CommandLineOriginChipLeftOfLocationBar) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableOriginChipLeftOfLocationBar);
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_LEFT_OF_LOCATION_BAR, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, CommandLineOriginChipRightOfLocationBar) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableOriginChipRightOfLocationBar);
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR, GetOriginChipPosition());
+}
+
+TEST_F(OriginChipTest, CommandLineOriginChipLeftOfMenu) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableOriginChipLeftOfMenu);
   EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_LEFT_OF_MENU, GetOriginChipPosition());
 }
 
 }  // namespace chrome