Revert of Add per-section clearing and dismissed suggestions to snippets-internals

components/ntp_snippets/ntp_snippets_service.cc

 // Copyright 2015 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/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 256 matching lines @@
         GetFetchingIntervalFallback(), GetRescheduleTime(now));
   } else {
     scheduler_->Unschedule();
   }
 }
 
 std::vector<Category> NTPSnippetsService::GetProvidedCategories() {
   return std::vector<Category>({provided_category_});
 }
 
-CategoryStatus NTPSnippetsService::GetCategoryStatus(Category category) {
-  DCHECK(category.IsKnownCategory(KnownCategories::ARTICLES));
-  return category_status_;
-}
-
-void NTPSnippetsService::DismissSuggestion(const std::string& suggestion_id) {
-  if (!ready())
-    return;
-
-  std::string snippet_id = GetWithinCategoryIDFromUniqueID(suggestion_id);
-
-  auto it =
-      std::find_if(snippets_.begin(), snippets_.end(),
-                   [&snippet_id](const std::unique_ptr<NTPSnippet>& snippet) {
-                     return snippet->id() == snippet_id;
-                   });
-  if (it == snippets_.end())
-    return;
-
-  (*it)->set_dismissed(true);
-
-  database_->SaveSnippet(**it);
-  database_->DeleteImage((*it)->id());
-
-  dismissed_snippets_.push_back(std::move(*it));
-  snippets_.erase(it);
-}
-
 void NTPSnippetsService::FetchSuggestionImage(
     const std::string& suggestion_id,
     const ImageFetchedCallback& callback) {
   std::string snippet_id = GetWithinCategoryIDFromUniqueID(suggestion_id);
   database_->LoadImage(
       snippet_id,
       base::Bind(&NTPSnippetsService::OnSnippetImageFetchedFromDatabase,
                  base::Unretained(this), snippet_id, callback));
 }
 
-void NTPSnippetsService::ClearCachedSuggestionsForDebugging(Category category) {
-  DCHECK_EQ(category, provided_category_);
+void NTPSnippetsService::ClearCachedSuggestionsForDebugging() {
   if (!initialized())
     return;
 
   if (snippets_.empty())
     return;
 
   database_->DeleteSnippets(snippets_);
   snippets_.clear();
 
   NotifyNewSuggestions();
 }
 
-std::vector<ContentSuggestion>
-NTPSnippetsService::GetDismissedSuggestionsForDebugging(Category category) {
-  DCHECK_EQ(category, provided_category_);
-  std::vector<ContentSuggestion> result;
-  for (const std::unique_ptr<NTPSnippet>& snippet : dismissed_snippets_) {
-    if (!snippet->is_complete())
-      continue;
-    ContentSuggestion suggestion(
-        MakeUniqueID(provided_category_, snippet->id()),
-        snippet->best_source().url);
-    suggestion.set_amp_url(snippet->best_source().amp_url);
-    suggestion.set_title(base::UTF8ToUTF16(snippet->title()));
-    suggestion.set_snippet_text(base::UTF8ToUTF16(snippet->snippet()));
-    suggestion.set_publish_date(snippet->publish_date());
-    suggestion.set_publisher_name(
-        base::UTF8ToUTF16(snippet->best_source().publisher_name));
-    suggestion.set_score(snippet->score());
-    result.emplace_back(std::move(suggestion));
-  }
-  return result;
-}
-
-void NTPSnippetsService::ClearDismissedSuggestionsForDebugging(
-    Category category) {
-  DCHECK_EQ(category, provided_category_);
-  if (!initialized())
-    return;
-
-  if (dismissed_snippets_.empty())
-    return;
-
-  database_->DeleteSnippets(dismissed_snippets_);
-  dismissed_snippets_.clear();
-}
-
 std::set<std::string> NTPSnippetsService::GetSuggestionsHosts() const {
   // |suggestions_service_| can be null in tests.
   if (!suggestions_service_)
     return std::set<std::string>();
 
   // TODO(treib): This should just call GetSnippetHostsFromPrefs.
   return GetSuggestionsHostsImpl(
       suggestions_service_->GetSuggestionsDataFromCache());
 }
 
+void NTPSnippetsService::DismissSuggestion(const std::string& suggestion_id) {
+  if (!ready())
+    return;
+
+  std::string snippet_id = GetWithinCategoryIDFromUniqueID(suggestion_id);
+
+  auto it =
+      std::find_if(snippets_.begin(), snippets_.end(),
+                   [&snippet_id](const std::unique_ptr<NTPSnippet>& snippet) {
+                     return snippet->id() == snippet_id;
+                   });
+  if (it == snippets_.end())
+    return;
+
+  (*it)->set_dismissed(true);
+
+  database_->SaveSnippet(**it);
+  database_->DeleteImage((*it)->id());
+
+  dismissed_snippets_.push_back(std::move(*it));
+  snippets_.erase(it);
+}
+
+void NTPSnippetsService::ClearDismissedSuggestionsForDebugging() {
+  if (!initialized())
+    return;
+
+  if (dismissed_snippets_.empty())
+    return;
+
+  database_->DeleteSnippets(dismissed_snippets_);
+  dismissed_snippets_.clear();
+}
+
+CategoryStatus NTPSnippetsService::GetCategoryStatus(Category category) {
+  DCHECK(category.IsKnownCategory(KnownCategories::ARTICLES));
+  return category_status_;
+}
+
 // static
 int NTPSnippetsService::GetMaxSnippetCountForTesting() {
   return kMaxSnippetCount;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Private methods
 
 // image_fetcher::ImageFetcherDelegate implementation.
 void NTPSnippetsService::OnImageDataFetched(const std::string& snippet_id,
@@ skipping 298 matching lines @@
   if (snippets_fetcher_->UsesHostRestrictions() && suggestions_service_) {
     suggestions_service_subscription_ =
         suggestions_service_->AddCallback(base::Bind(
             &NTPSnippetsService::OnSuggestionsChanged, base::Unretained(this)));
   }
 
   RescheduleFetching();
 }
 
 void NTPSnippetsService::EnterStateDisabled() {
-  ClearCachedSuggestionsForDebugging(provided_category_);
-  ClearDismissedSuggestionsForDebugging(provided_category_);
+  ClearCachedSuggestionsForDebugging();
+  ClearDismissedSuggestionsForDebugging();
 
   expiry_timer_.Stop();
   suggestions_service_subscription_.reset();
   RescheduleFetching();
 }
 
 void NTPSnippetsService::EnterStateError() {
   expiry_timer_.Stop();
   suggestions_service_subscription_.reset();
   RescheduleFetching();
@@ skipping 101 matching lines @@
 void NTPSnippetsService::UpdateCategoryStatus(CategoryStatus status) {
   if (status == category_status_)
     return;
 
   category_status_ = status;
   observer()->OnCategoryStatusChanged(this, provided_category_,
                                       category_status_);
 }
 
 }  // namespace ntp_snippets