[Remote suggestions] Clean up variation params in the fetcher.

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 522 matching lines @@
 #endif  // OS_ANDROID
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam kNTPSnippetsFeatureVariationChromeReader[] = {
     {"content_suggestions_backend", ntp_snippets::kChromeReaderServer}};
 
 const FeatureEntry::FeatureParam kNTPSnippetsFeatureVariationServer[] = {
     {"content_suggestions_backend",
      ntp_snippets::kContentSuggestionsServer}};
 
-const FeatureEntry::FeatureParam

[jkrcal, 2017/02/03 10:17:49]

I've forgotten to remove this in the previous patch list.

-    kNTPSnippetsFeatureVariationServerNonPersonalized[] = {
-        {"content_suggestions_backend",
-         ntp_snippets::kContentSuggestionsServer},
-        {"fetching_personalization", "non_personal"}};
-
 const FeatureEntry::FeatureVariation kNTPSnippetsFeatureVariations[] = {
     {"via ChromeReader", kNTPSnippetsFeatureVariationChromeReader,
      arraysize(kNTPSnippetsFeatureVariationChromeReader), nullptr},
     {"via content suggestion server (backed by ChromeReader)",
      kNTPSnippetsFeatureVariationServer,
      arraysize(kNTPSnippetsFeatureVariationServer), nullptr},
-    {"via content suggestion server (backed by ChromeReader, non-personalized)",
-     kNTPSnippetsFeatureVariationServerNonPersonalized,
-     arraysize(kNTPSnippetsFeatureVariationServerNonPersonalized), nullptr},
     {"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"}};
+     arraysize(kNTPSnippetsFeatureVariationServer), "3313279"}};
 #endif  // 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 1837 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags