[Remote suggestions] Add a remote suggestions flag to choose the source

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index da30d78f79dab1fe096b342ffcbcb04efa249da8..b6b78e8a3e48eae7215aa4cd897f4135af8dfd77 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -546,22 +546,22 @@ const FeatureEntry::FeatureVariation
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
-const FeatureEntry::FeatureParam kNTPSnippetsFeatureVariationChromeReader[] = {
-    {"content_suggestions_backend", ntp_snippets::kChromeReaderServer}};
+const FeatureEntry::FeatureParam
+    kRemoteSuggestionsFeatureVariationChromeReader[] = {
+        {"content_suggestions_backend", ntp_snippets::kChromeReaderServer}};

[Marc Treib, 2017/02/22 12:45:55]

Huh, now that I look at this: Didn't we want to get rid of the direct
ChromeReader integration?
(Of course this CL is still fine; but it's possible that most of this will go
away soon.)

[jkrcal, 2017/02/22 13:32:15]

Good point. Even while we support direct CR integration, I think it makes no
sense to reveal it here any more.

 
-const FeatureEntry::FeatureParam kNTPSnippetsFeatureVariationServer[] = {
-    {"content_suggestions_backend",
-     ntp_snippets::kContentSuggestionsServer}};
+const FeatureEntry::FeatureParam kRemoteSuggestionsFeatureVariationServer[] = {

[Marc Treib, 2017/02/22 12:45:55]

The "Server" suffix is kinda pointless; it's a server anyway... Maybe
"CSServer"? (no need to fully spell it out IMO, but "CSS" is probably too
misleading)

[jkrcal, 2017/02/22 13:32:15]

Changed to ContentSuggestionsServer.

+    {"content_suggestions_backend", ntp_snippets::kContentSuggestionsServer}};
 
-const FeatureEntry::FeatureVariation kNTPSnippetsFeatureVariations[] = {
-    {"via ChromeReader", kNTPSnippetsFeatureVariationChromeReader,
-     arraysize(kNTPSnippetsFeatureVariationChromeReader), nullptr},
+const FeatureEntry::FeatureVariation kRemoteSuggestionsFeatureVariations[] = {
+    {"via ChromeReader", kRemoteSuggestionsFeatureVariationChromeReader,
+     arraysize(kRemoteSuggestionsFeatureVariationChromeReader), nullptr},
     {"via content suggestion server (backed by ChromeReader)",
-     kNTPSnippetsFeatureVariationServer,
-     arraysize(kNTPSnippetsFeatureVariationServer), nullptr},
+     kRemoteSuggestionsFeatureVariationServer,
+     arraysize(kRemoteSuggestionsFeatureVariationServer), nullptr},
     {"via content suggestion server (backed by Google Now)",
-     kNTPSnippetsFeatureVariationServer,
-     arraysize(kNTPSnippetsFeatureVariationServer), "3313279"}};
+     kRemoteSuggestionsFeatureVariationServer,
+     arraysize(kRemoteSuggestionsFeatureVariationServer), "3313279"}};
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
@@ -1862,11 +1862,6 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_WITH_VARIATIONS_VALUE_TYPE_WITH_DEFAULT_TRIAL(
          ntp_snippets::kCategoryRanker,
          kContentSuggestionsCategoryRankerFeatureVariations)},
-    {"override-ntp-suggestions-source", IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_NAME,
-     IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_DESCRIPTION, kOsAndroid,
-     FEATURE_WITH_VARIATIONS_VALUE_TYPE(ntp_snippets::kContentSuggestionsSource,
-                                        kNTPSnippetsFeatureVariations,
-                                        ntp_snippets::kStudyName)},
     {"enable-ntp-snippets-increased-visibility",
      IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_NAME,
      IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_DESCRIPTION, kOsAndroid,
@@ -1877,6 +1872,12 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-ntp-offline-badge", IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_NAME,
      IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kOfflineBadgeFeature)},
+    {"enable-ntp-remote-suggestions",
+     IDS_FLAGS_ENABLE_NTP_REMOTE_SUGGESTIONS_NAME,
+     IDS_FLAGS_ENABLE_NTP_REMOTE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
+     FEATURE_WITH_VARIATIONS_VALUE_TYPE_WITH_DEFAULT_TRIAL(
+         ntp_snippets::kArticleSuggestionsFeature,
+         kRemoteSuggestionsFeatureVariations)},
     {"enable-ntp-recent-offline-tab-suggestions",
      IDS_FLAGS_ENABLE_NTP_RECENT_OFFLINE_TAB_SUGGESTIONS_NAME,
      IDS_FLAGS_ENABLE_NTP_RECENT_OFFLINE_TAB_SUGGESTIONS_DESCRIPTION,