Omnibox UI Experiments: Clean up naming for Vertical Margin

chrome/browser/about_flags.cc

 // Copyright (c) 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/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 949 matching lines @@
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flag_descriptions::kEnableHeapProfilingModePseudo,
      switches::kEnableHeapProfiling, switches::kEnableHeapProfilingModePseudo},
     {flag_descriptions::kEnableHeapProfilingModeNative,
      switches::kEnableHeapProfiling, switches::kEnableHeapProfilingModeNative},
     {flag_descriptions::kEnableHeapProfilingTaskProfiler,
      switches::kEnableHeapProfiling,
      switches::kEnableHeapProfilingTaskProfiler}};
 
 const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin4px[] = {
-    {OmniboxFieldTrial::kUIExperimentsVerticalMarginParam, "4"}};
+    {OmniboxFieldTrial::kUIVerticalMarginParam, "4"}};
 const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin8px[] = {
-    {OmniboxFieldTrial::kUIExperimentsVerticalMarginParam, "8"}};
+    {OmniboxFieldTrial::kUIVerticalMarginParam, "8"}};
 const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin12px[] = {
-    {OmniboxFieldTrial::kUIExperimentsVerticalMarginParam, "12"}};
+    {OmniboxFieldTrial::kUIVerticalMarginParam, "12"}};
 const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin16px[] = {
-    {OmniboxFieldTrial::kUIExperimentsVerticalMarginParam, "16"}};
+    {OmniboxFieldTrial::kUIVerticalMarginParam, "16"}};
 const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin20px[] = {
-    {OmniboxFieldTrial::kUIExperimentsVerticalMarginParam, "20"}};
+    {OmniboxFieldTrial::kUIVerticalMarginParam, "20"}};
 
 const FeatureEntry::FeatureVariation kOmniboxUIVerticalMarginVariations[] = {
     {"4px vertical margin", kOmniboxUIVerticalMargin4px,
      arraysize(kOmniboxUIVerticalMargin4px), nullptr},
     {"8px vertical margin", kOmniboxUIVerticalMargin8px,
      arraysize(kOmniboxUIVerticalMargin8px), nullptr},
     {"12px vertical margin", kOmniboxUIVerticalMargin12px,
      arraysize(kOmniboxUIVerticalMargin12px), nullptr},
     {"16px vertical margin", kOmniboxUIVerticalMargin16px,
      arraysize(kOmniboxUIVerticalMargin16px), nullptr},
@@ skipping 1867 matching lines @@
 
 #if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS))
     {"show-cert-link", flag_descriptions::kShowCertLinkOnPageInfoName,
      flag_descriptions::kShowCertLinkOnPageInfoDescription, kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kShowCertLink)},
 #endif
 
     {"omnibox-ui-vertical-margin",
      flag_descriptions::kOmniboxUIVerticalMarginName,
      flag_descriptions::kOmniboxUIVerticalMarginDescription, kOsDesktop,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kUIExperiments,
+     FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kUIExperimentVerticalMargin,
                                     kOmniboxUIVerticalMarginVariations,
                                     "OmniboxUIVerticalMarginVariations")},
 
     {"use-suggestions-even-if-few",
      flag_descriptions::kUseSuggestionsEvenIfFewFeatureName,
      flag_descriptions::kUseSuggestionsEvenIfFewFeatureDescription, kOsAll,
      FEATURE_VALUE_TYPE(suggestions::kUseSuggestionsEvenIfFewFeature)},
 
     {"enable-location-hard-reload", flag_descriptions::kLocationHardReloadName,
      flag_descriptions::kLocationHardReloadDescription, kOsAll,
@@ skipping 222 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags