Drop ntp_snippets::kStudyName in chrome://flags

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 556 matching lines @@
          nullptr}};
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureVariation
     kContentSuggestionsNotificationsFeatureVariations[] = {
         {"(notify always)", nullptr, 0, "3313312"}};
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
-const FeatureEntry::FeatureParam
-    kRemoteSuggestionsFeatureVariationContentSuggestionsServer[] = {
-        {"content_suggestions_backend",
-         ntp_snippets::kContentSuggestionsServer}};
-
 const FeatureEntry::FeatureVariation kRemoteSuggestionsFeatureVariations[] = {
-    {"via content suggestion server (backed by ChromeReader)",
-     kRemoteSuggestionsFeatureVariationContentSuggestionsServer,
-     arraysize(kRemoteSuggestionsFeatureVariationContentSuggestionsServer),
+    {"via content suggestion server (backed by ChromeReader)", nullptr, 0,
      nullptr},
-    {"via content suggestion server (backed by Google Now)",
-     kRemoteSuggestionsFeatureVariationContentSuggestionsServer,
-     arraysize(kRemoteSuggestionsFeatureVariationContentSuggestionsServer),
+    {"via content suggestion server (backed by Google Now)", nullptr, 0,
      "3313279"}};
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam kCondensedTileLayoutForSmallScreensEnabled[] =
     {{"condensed_tile_layout_for_small_screens_enabled", "true"}};
 
 const FeatureEntry::FeatureParam kCondensedTileLayoutForLargeScreensEnabled[] =
     {{"condensed_tile_layout_for_large_screens_enabled", "true"}};
 
@@ skipping 1364 matching lines @@
      flag_descriptions::kDisableTabForDesktopShareDescription, kOsAll,
      SINGLE_VALUE_TYPE(extensions::switches::kDisableTabForDesktopShare)},
 #endif  // ENABLE_EXTENSIONS
 #if defined(OS_ANDROID)
     {"content-suggestions-category-order",
      flag_descriptions::kContentSuggestionsCategoryOrderName,
      flag_descriptions::kContentSuggestionsCategoryOrderDescription, kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          ntp_snippets::kCategoryOrder,
          kContentSuggestionsCategoryOrderFeatureVariations,
-         ntp_snippets::kStudyName)},
+         ntp_snippets::kCategoryOrder.name)},
     {"content-suggestions-category-ranker",
      flag_descriptions::kContentSuggestionsCategoryRankerName,
      flag_descriptions::kContentSuggestionsCategoryRankerDescription,
      kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          ntp_snippets::kCategoryRanker,
          kContentSuggestionsCategoryRankerFeatureVariations,
-         ntp_snippets::kStudyName)},
+         ntp_snippets::kCategoryRanker.name)},
     {"enable-ntp-snippets-increased-visibility",
      flag_descriptions::kEnableNtpSnippetsVisibilityName,
      flag_descriptions::kEnableNtpSnippetsVisibilityDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kIncreasedVisibility)},
     {"enable-content-suggestions-new-favicon-server",
      flag_descriptions::kEnableContentSuggestionsNewFaviconServerName,
      flag_descriptions::kEnableContentSuggestionsNewFaviconServerDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kPublisherFaviconsFromNewServerFeature)},
     {"enable-ntp-save-to-offline",
      flag_descriptions::kEnableNtpSaveToOfflineName,
      flag_descriptions::kEnableNtpSaveToOfflineDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kSaveToOfflineFeature)},
     {"enable-ntp-offline-badge", flag_descriptions::kEnableNtpOfflineBadgeName,
      flag_descriptions::kEnableNtpOfflineBadgeDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kOfflineBadgeFeature)},
     {"enable-ntp-remote-suggestions",
      flag_descriptions::kEnableNtpRemoteSuggestionsName,
      flag_descriptions::kEnableNtpRemoteSuggestionsDescription, kOsAndroid,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(ntp_snippets::kArticleSuggestionsFeature,
-                                    kRemoteSuggestionsFeatureVariations,
-                                    ntp_snippets::kStudyName)},
+     FEATURE_WITH_PARAMS_VALUE_TYPE(
+         ntp_snippets::kArticleSuggestionsFeature,
+         kRemoteSuggestionsFeatureVariations,
+         ntp_snippets::kArticleSuggestionsFeature.name)},
     {"enable-ntp-recent-offline-tab-suggestions",
      flag_descriptions::kEnableNtpRecentOfflineTabSuggestionsName,
      flag_descriptions::kEnableNtpRecentOfflineTabSuggestionsDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kRecentOfflineTabSuggestionsFeature)},
     {"enable-ntp-asset-download-suggestions",
      flag_descriptions::kEnableNtpAssetDownloadSuggestionsName,
      flag_descriptions::kEnableNtpAssetDownloadSuggestionsDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(features::kAssetDownloadSuggestionsFeature)},
@@ skipping 16 matching lines @@
      flag_descriptions::kEnableNtpForeignSessionsSuggestionsDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kForeignSessionsSuggestionsFeature)},
     {"enable-ntp-suggestions-notifications",
      flag_descriptions::kEnableNtpSuggestionsNotificationsName,
      flag_descriptions::kEnableNtpSuggestionsNotificationsDescription,
      kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          params::ntp_snippets::kNotificationsFeature,
          kContentSuggestionsNotificationsFeatureVariations,
-         ntp_snippets::kStudyName)},
+         params::ntp_snippets::kNotificationsFeature.name)},
     {"ntp-condensed-layout", flag_descriptions::kNtpCondensedLayoutName,
      flag_descriptions::kNtpCondensedLayoutDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kNTPCondensedLayoutFeature)},
     {"ntp-condensed-tile-layout",
      flag_descriptions::kNtpCondensedTileLayoutName,
      flag_descriptions::kNtpCondensedTileLayoutDescription, kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          chrome::android::kNTPCondensedTileLayoutFeature,
          kNTPCondensedTileLayoutFeatureVariations,
-         ntp_snippets::kStudyName)},
+         chrome::android::kNTPCondensedTileLayoutFeature.name)},
     {"ntp-google-g-in-omnibox", flag_descriptions::kNtpGoogleGInOmniboxName,
      flag_descriptions::kNtpGoogleGInOmniboxDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::NTPShowGoogleGInOmniboxFeature)},
 #endif  // OS_ANDROID
 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \
     !defined(MEDIA_DISABLE_FFMPEG)
     {"enable-webrtc-h264-with-openh264-ffmpeg",
      flag_descriptions::kWebrtcH264WithOpenh264FfmpegName,
      flag_descriptions::kWebrtcH264WithOpenh264FfmpegDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
@@ skipping 636 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags