[OriginChip] Add an option to display only on search result pages.

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 634 matching lines @@
   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 GetOriginChipV2HideTrigger() != ORIGIN_CHIP_V2_DISABLED;
+  return GetOriginChipV2Condition() != ORIGIN_CHIP_V2_DISABLED;
 }
 
-OriginChipV2HideTrigger GetOriginChipV2HideTrigger() {
+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<OriginChipV2HideTrigger>(value) :
+      static_cast<OriginChipV2Condition>(value) :
       ORIGIN_CHIP_V2_DISABLED;
 }
 
 bool ShouldShowGoogleLocalNTP() {
   FieldTrialFlags flags;
   return !GetFieldTrialInfo(&flags) || GetBoolValueForFlagWithDefault(
       kShouldShowGoogleLocalNTPFlagName, true, flags);
 }
 
 GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
@@ skipping 157 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