Remove origin chip v1 and "hide on input" v2 behavior.

chrome/browser/search/search.cc

 // Copyright 2012 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 "chrome/browser/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 54 matching lines @@
 
 const char kHideVerbatimFlagName[] = "hide_verbatim";
 const char kPrefetchSearchResultsFlagName[] = "prefetch_results";
 const char kPrefetchSearchResultsOnSRP[] = "prefetch_results_srp";
 
 // Controls whether to reuse prerendered Instant Search base page to commit any
 // search query.
 const char kReuseInstantSearchBasePage[] = "reuse_instant_search_base_page";
 
 const char kDisplaySearchButtonFlagName[] = "display_search_button";
-const char kOriginChipFlagName[] = "origin_chip";
-const char kOriginChipV2FlagName[] = "origin_chip_v2";
+const char kOriginChipFlagName[] = "origin_chip_v2";
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 const char kEnableQueryExtractionFlagName[] = "query_extraction";
 #endif
 const char kShouldShowGoogleLocalNTPFlagName[] = "google_local_ntp";
 
 // Constants for the field trial name and group prefix.
 // Note in M30 and below this field trial was named "InstantExtended" and in
 // M31 was renamed to EmbeddedSearch for clarity and cleanliness.  Since we
 // can't easilly sync up Finch configs with the pushing of this change to
 // Dev & Canary, for now the code accepts both names.
@@ skipping 529 matching lines @@
   if (!GetFieldTrialInfo(&flags))
     return DISPLAY_SEARCH_BUTTON_NEVER;
   uint64 value =
       GetUInt64ValueForFlagWithDefault(kDisplaySearchButtonFlagName, 0, flags);
   return (value < DISPLAY_SEARCH_BUTTON_NUM_VALUES) ?
       static_cast<DisplaySearchButtonConditions>(value) :
       DISPLAY_SEARCH_BUTTON_NEVER;
 }
 
 bool ShouldDisplayOriginChip() {
-  return GetOriginChipPosition() != ORIGIN_CHIP_DISABLED;
+  return GetOriginChipCondition() != ORIGIN_CHIP_DISABLED;
 }
 
-OriginChipPosition GetOriginChipPosition() {
-  if (ShouldDisplayOriginChipV2())
-    return ORIGIN_CHIP_DISABLED;
-
+OriginChipCondition GetOriginChipCondition() {
   const CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kDisableOriginChip))
     return ORIGIN_CHIP_DISABLED;
-  if (cl->HasSwitch(switches::kEnableOriginChipLeadingLocationBar))
-    return ORIGIN_CHIP_LEADING_LOCATION_BAR;
-  if (cl->HasSwitch(switches::kEnableOriginChip) ||
-      cl->HasSwitch(switches::kEnableOriginChipTrailingLocationBar))
-    return ORIGIN_CHIP_TRAILING_LOCATION_BAR;
-  if (cl->HasSwitch(switches::kEnableOriginChipLeadingMenuButton))
-    return ORIGIN_CHIP_LEADING_MENU_BUTTON;
+  if (cl->HasSwitch(switches::kEnableOriginChip))
+    return ORIGIN_CHIP_ENABLED;
+  if (cl->HasSwitch(switches::kEnableOriginChipOnSrp))
+    return ORIGIN_CHIP_ON_SRP;
 
   FieldTrialFlags flags;
   if (!GetFieldTrialInfo(&flags))
     return ORIGIN_CHIP_DISABLED;
   uint64 value =
       GetUInt64ValueForFlagWithDefault(kOriginChipFlagName, 0, flags);
-  return (value < ORIGIN_CHIP_NUM_VALUES) ?
-      static_cast<OriginChipPosition>(value) :
-      ORIGIN_CHIP_DISABLED;
-}
-
-bool ShouldDisplayOriginChipV2() {
-  return GetOriginChipV2Condition() != ORIGIN_CHIP_V2_DISABLED;
-}
-
-OriginChipV2Condition GetOriginChipV2Condition() {
-  const CommandLine* cl = CommandLine::ForCurrentProcess();
-  if (cl->HasSwitch(switches::kDisableOriginChipV2))
-    return ORIGIN_CHIP_V2_DISABLED;
-  if (cl->HasSwitch(switches::kEnableOriginChipV2HideOnMouseRelease))
-    return ORIGIN_CHIP_V2_HIDE_ON_MOUSE_RELEASE;
-  if (cl->HasSwitch(switches::kEnableOriginChipV2HideOnUserInput))
-    return ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT;
-  if (cl->HasSwitch(switches::kEnableOriginChipV2OnSrp))
-    return ORIGIN_CHIP_V2_ON_SRP;
-
-  FieldTrialFlags flags;
-  if (!GetFieldTrialInfo(&flags))
-    return ORIGIN_CHIP_V2_DISABLED;
-  uint64 value =
-      GetUInt64ValueForFlagWithDefault(kOriginChipV2FlagName, 0, flags);
-  return (value < ORIGIN_CHIP_V2_NUM_VALUES) ?
-      static_cast<OriginChipV2Condition>(value) :
-      ORIGIN_CHIP_V2_DISABLED;
+  return ((value < ORIGIN_CHIP_NUM_VALUES) &&
+          (value != ORIGIN_CHIP_UNUSED_PLACEHOLDER)) ?
+      static_cast<OriginChipCondition>(value) : ORIGIN_CHIP_DISABLED;
 }
 
 bool ShouldShowGoogleLocalNTP() {
   FieldTrialFlags flags;
   return !GetFieldTrialInfo(&flags) || GetBoolValueForFlagWithDefault(
       kShouldShowGoogleLocalNTPFlagName, true, flags);
 }
 
 GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
   CHECK(ShouldAssignURLToInstantRenderer(url, profile))
@@ skipping 156 matching lines @@
 
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 }  // namespace chrome