Add base::FeatureParam<> struct

components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc

 // Copyright 2016 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 "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace ntp_snippets {
 
 namespace {
 
-const int kMaxBookmarks = 10;
-const int kMaxBookmarkAgeInDays = 7;
-
-const char* kMaxBookmarksParamName = "bookmarks_max_count";
-const char* kMaxBookmarkAgeInDaysParamName = "bookmarks_max_age_in_days";
-const char* kConsiderDesktopVisitsParamName =
-    "bookmarks_consider_desktop_visits";
+constexpr base::FeatureParam<int> kMaxBookmarksParam{
+    &kBookmarkSuggestionsFeature, "bookmarks_max_count", 10};
+constexpr base::FeatureParam<int> kMaxBookmarkAgeInDaysParam{
+    &kBookmarkSuggestionsFeature, "bookmarks_max_age_in_days", 7};
+constexpr base::FeatureParam<bool> kConsiderDesktopVisitsParam{
+    &kBookmarkSuggestionsFeature, "bookmarks_consider_desktop_visits", false};

[Alexei Svitkine (slow), 2017/08/24 18:13:05]

Seems you're changing logic as the previous code had true set.

[sfiera, 2017/08/25 11:56:16]

Fixed.

 
 // Any bookmark created or visited after this time will be considered recent.
 // Note that bookmarks can be shown that do not meet this threshold.
 base::Time GetThresholdTime() {
   return base::Time::Now() -
-         base::TimeDelta::FromDays(variations::GetVariationParamByFeatureAsInt(
-             ntp_snippets::kBookmarkSuggestionsFeature,
-             kMaxBookmarkAgeInDaysParamName, kMaxBookmarkAgeInDays));
-}
-
-// The maximum number of suggestions ever provided.
-int GetMaxCount() {
-  return variations::GetVariationParamByFeatureAsInt(
-      ntp_snippets::kBookmarkSuggestionsFeature, kMaxBookmarksParamName,
-      kMaxBookmarks);
-}
-
-bool AreDesktopVisitsConsidered() {
-  return variations::GetVariationParamByFeatureAsBool(
-      ntp_snippets::kBookmarkSuggestionsFeature,
-      kConsiderDesktopVisitsParamName, true);
+         base::TimeDelta::FromDays(kMaxBookmarkAgeInDaysParam.Get());
 }
 
 }  // namespace
 
 BookmarkSuggestionsProvider::BookmarkSuggestionsProvider(
     ContentSuggestionsProvider::Observer* observer,
     bookmarks::BookmarkModel* bookmark_model)
     : ContentSuggestionsProvider(observer),
       category_status_(CategoryStatus::AVAILABLE_LOADING),
       provided_category_(
           Category::FromKnownCategory(KnownCategories::BOOKMARKS)),
       bookmark_model_(bookmark_model),
       fetch_requested_(false),
       end_of_list_last_visit_date_(GetThresholdTime()),
-      consider_bookmark_visits_from_desktop_(AreDesktopVisitsConsidered()) {
+      consider_bookmark_visits_from_desktop_(
+          kConsiderDesktopVisitsParam.Get()) {
   observer->OnCategoryStatusChanged(this, provided_category_, category_status_);
   bookmark_model_->AddObserver(this);
   FetchBookmarks();
 }
 
 BookmarkSuggestionsProvider::~BookmarkSuggestionsProvider() {
   bookmark_model_->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 182 matching lines @@
   suggestions->emplace_back(std::move(suggestion));
 }
 
 void BookmarkSuggestionsProvider::FetchBookmarksInternal() {
   DCHECK(bookmark_model_->loaded());
 
   NotifyStatusChanged(CategoryStatus::AVAILABLE);
 
   base::Time threshold_time = GetThresholdTime();
   std::vector<const BookmarkNode*> bookmarks = GetRecentlyVisitedBookmarks(
-      bookmark_model_, GetMaxCount(), threshold_time,
+      bookmark_model_, kMaxBookmarksParam.Get(), threshold_time,
       consider_bookmark_visits_from_desktop_);
 
   std::vector<ContentSuggestion> suggestions;
   for (const BookmarkNode* bookmark : bookmarks) {
     ConvertBookmark(*bookmark, &suggestions);
   }
 
   if (suggestions.empty()) {
     end_of_list_last_visit_date_ = threshold_time;
   } else {
@@ skipping 14 matching lines @@
 void BookmarkSuggestionsProvider::NotifyStatusChanged(
     CategoryStatus new_status) {
   if (category_status_ == new_status) {
     return;
   }
   category_status_ = new_status;
   observer()->OnCategoryStatusChanged(this, provided_category_, new_status);
 }
 
 }  // namespace ntp_snippets