Add other variations (with ids) for NTPSnippets to 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 539 matching lines @@
     kNTPSnippetsFeatureVariationOnlyNonPersonalHostRestricted[] = {
         {"fetching_personalization", "non_personal"},
         {"fetching_host_restrict", "on"},
 };
 const FeatureEntry::FeatureParam
     kNTPSnippetsFeatureVariationOnlyPersonalHostRestricted[] = {
         {"fetching_personalization", "personal"},
         {"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)
 const FeatureEntry::Choice kUpdateMenuItemSummaryChoices[] = {
     {IDS_FLAGS_UPDATE_MENU_ITEM_NO_SUMMARY, "", ""},
     {IDS_FLAGS_UPDATE_MENU_ITEM_DEFAULT_SUMMARY,
         switches::kForceShowUpdateMenuItemSummary, ""},
     {IDS_FLAGS_UPDATE_MENU_ITEM_NEW_FEATURES_SUMMARY,
         switches::kForceShowUpdateMenuItemNewFeaturesSummary, ""},
     {IDS_FLAGS_UPDATE_MENU_ITEM_CUSTOM_SUMMARY,
@@ skipping 1518 matching lines @@
                             base::CommandLine* command_line,
                             flags_ui::SentinelsMode sentinels) {
   if (command_line->HasSwitch(switches::kNoExperiments))
     return;
 
   FlagsStateSingleton::GetFlagsState()->ConvertFlagsToSwitches(
       flags_storage, command_line, sentinels, switches::kEnableFeatures,
       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(
     const base::CommandLine& new_cmdline,
     const base::CommandLine& active_cmdline,
     std::set<base::CommandLine::StringType>* out_difference) {
   const char* extra_flag_sentinel_begin_flag_name = nullptr;
   const char* extra_flag_sentinel_end_flag_name = nullptr;
 #if defined(OS_CHROMEOS)
   // Put the flags between --policy-switches--begin and --policy-switches-end on
@@ skipping 87 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags