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

components/ntp_snippets/content_suggestions_service.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/content_suggestions_service.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 61 matching lines @@
     LOG(WARNING) << "Requested image for suggestion " << suggestion_id
                  << " for unavailable category " << category;
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, suggestion_id, gfx::Image()));
     return;
   }
   providers_by_category_[category]->FetchSuggestionImage(suggestion_id,
                                                          callback);
 }
 
-void ContentSuggestionsService::ClearAllCachedSuggestionsForDebugging() {
+void ContentSuggestionsService::ClearCachedSuggestionsForDebugging() {
   suggestions_by_category_.clear();
   id_category_map_.clear();
-  for (const auto& category_provider_pair : providers_by_category_) {
-    category_provider_pair.second->ClearCachedSuggestionsForDebugging(
-        category_provider_pair.first);
+  for (auto& category_provider_pair : providers_by_category_) {
+    category_provider_pair.second->ClearCachedSuggestionsForDebugging();
   }
   FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
 }
 
-void ContentSuggestionsService::ClearCachedSuggestionsForDebugging(
-    Category category) {
-  for (const ContentSuggestion& suggestion :
-       suggestions_by_category_[category]) {
-    id_category_map_.erase(suggestion.id());
+void ContentSuggestionsService::ClearDismissedSuggestionsForDebugging() {
+  for (auto& category_provider_pair : providers_by_category_) {
+    category_provider_pair.second->ClearDismissedSuggestionsForDebugging();
   }
-  suggestions_by_category_[category].clear();
-  auto iterator = providers_by_category_.find(category);
-  if (iterator != providers_by_category_.end())
-    iterator->second->ClearCachedSuggestionsForDebugging(category);
-}
-
-std::vector<ContentSuggestion>
-ContentSuggestionsService::GetDismissedSuggestionsForDebugging(
-    Category category) {
-  auto iterator = providers_by_category_.find(category);
-  if (iterator == providers_by_category_.end())
-    return std::vector<ContentSuggestion>();
-  return iterator->second->GetDismissedSuggestionsForDebugging(category);
-}
-
-void ContentSuggestionsService::ClearDismissedSuggestionsForDebugging(
-    Category category) {
-  auto iterator = providers_by_category_.find(category);
-  if (iterator != providers_by_category_.end())
-    iterator->second->ClearDismissedSuggestionsForDebugging(category);
 }
 
 void ContentSuggestionsService::DismissSuggestion(
     const std::string& suggestion_id) {
   if (!id_category_map_.count(suggestion_id)) {
     LOG(WARNING) << "Dismissed unknown suggestion " << suggestion_id;
     return;
   }
   Category category = id_category_map_.at(suggestion_id);
   if (!providers_by_category_.count(category)) {
@@ skipping 111 matching lines @@
   return true;
 }
 
 void ContentSuggestionsService::NotifyCategoryStatusChanged(Category category) {
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnCategoryStatusChanged(category, GetCategoryStatus(category)));
 }
 
 }  // namespace ntp_snippets