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

chrome/browser/search/search_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
@@ skipping 894 matching lines @@
   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());

[msw, 2014/01/10 18:26:04]

nit: also check EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition()); here
(it's a little redundant, but maybe worthwhile).

[Justin Donnelly, 2014/01/10 20:11:31]

Oops, yeah, meant to add this everywhere but missed this one. Done.

 }
 
 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());
-}
-
-TEST_F(OriginChipTest, OriginChip) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group1 espv:2 origin_chip:1"));
-  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipPosition());
 }
 
 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:0"));
+  EXPECT_TRUE(ShouldDisplayOriginChip());
+  EXPECT_EQ(ORIGIN_CHIP_RIGHT_OF_LOCATION_BAR, GetOriginChipPosition());
+}
+
+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