Add other variations (with ids) for NTPSnippets to chrome://flags

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 636457819df4d695daec3b5c24845e499658847b..b5193ec05577654d5e6674458f712841707bc600 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -557,16 +557,40 @@ const FeatureEntry::FeatureParam
         {"fetching_host_restrict", "on"},
 };
 
+const FeatureEntry::FeatureParam kNTPSnippetsFeatureVariationServer[] = {
+    {"content_suggestions_backend",
+     "https://dev-chromecontentsuggestions-pa.sandbox.googleapis.com/v1/"
+     "snippets/list"}};
+
+const FeatureEntry::FeatureParam
+    kNTPSnippetsFeatureVariationServerNonPersonalized[] = {
+        {"content_suggestions_backend",
+         "https://dev-chromecontentsuggestions-pa.sandbox.googleapis.com/v1/"
+         "snippets/list"},
+        {"fetching_personalization", "non_personal"}};
+
 const FeatureEntry::FeatureVariation kNTPSnippetsFeatureVariations[] = {
-    {"only personalized", kNTPSnippetsFeatureVariationOnlyPersonal,
-     arraysize(kNTPSnippetsFeatureVariationOnlyPersonal)},
-    {"only from most visited sites",
+    {"via ChromeReader (only personalized)",
+     kNTPSnippetsFeatureVariationOnlyPersonal,
+     arraysize(kNTPSnippetsFeatureVariationOnlyPersonal), ""},
+    {"via ChromeReader (only from most visited sites)",
      kNTPSnippetsFeatureVariationOnlyNonPersonalHostRestricted,
-     arraysize(kNTPSnippetsFeatureVariationOnlyPersonal)},
-    {"only personalized from most visited sites",
+     arraysize(kNTPSnippetsFeatureVariationOnlyPersonal), ""},
+    {"via ChromeReader (only personalized from most visited sites)",
      kNTPSnippetsFeatureVariationOnlyPersonalHostRestricted,
-     arraysize(kNTPSnippetsFeatureVariationOnlyPersonalHostRestricted)},
-};
+     arraysize(kNTPSnippetsFeatureVariationOnlyPersonalHostRestricted), ""},
+    {"via content suggestion server (backed by ChromeReader)",
+     kNTPSnippetsFeatureVariationServer,
+     arraysize(kNTPSnippetsFeatureVariationServer), ""},
+    {"via content suggestion server (backed by ChromeReader, non-personalized)",
+     kNTPSnippetsFeatureVariationServerNonPersonalized,
+     arraysize(kNTPSnippetsFeatureVariationServerNonPersonalized), ""},
+    {"via content suggestion server (backed by Google Now)",
+     kNTPSnippetsFeatureVariationServer,
+     arraysize(kNTPSnippetsFeatureVariationServer), "3313279"},
+    {"via content suggestion server (backed by Google Now, non-personalized)",
+     kNTPSnippetsFeatureVariationServerNonPersonalized,
+     arraysize(kNTPSnippetsFeatureVariationServerNonPersonalized), "3313279"}};
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
@@ -2105,11 +2129,11 @@ void ConvertFlagsToSwitches(flags_ui::FlagsStorage* flags_storage,
       switches::kDisableFeatures);
 }
 
-void RegisterAllFeatureVariationParameters(
+std::string  RegisterAllFeatureVariationParameters(

[Alexei Svitkine (slow), 2016/07/25 19:15:50]

Nit: Remove extra space.

[jkrcal, 2016/07/26 09:00:21]

Done.

     flags_ui::FlagsStorage* flags_storage,
     base::FeatureList* feature_list) {
-  FlagsStateSingleton::GetFlagsState()->RegisterAllFeatureVariationParameters(
-      flags_storage, feature_list);
+  return FlagsStateSingleton::GetFlagsState()
+      ->RegisterAllFeatureVariationParameters(flags_storage, feature_list);
 }
 
 bool AreSwitchesIdenticalToCurrentCommandLine(