[NTP Snippets] Properly restore the status of restored sections

components/ntp_snippets/remote/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/remote/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 296 matching lines @@
 CategoryStatus NTPSnippetsService::GetCategoryStatus(Category category) {
   DCHECK(base::ContainsKey(categories_, category));
   return categories_[category].status;
 }
 
 CategoryInfo NTPSnippetsService::GetCategoryInfo(Category category) {
   DCHECK(base::ContainsKey(categories_, category));
   const CategoryContent& content = categories_[category];
   return CategoryInfo(content.localized_title,
                       ContentSuggestionsCardLayout::FULL_CARD,
-                      /* has_more_button */ false,
-                      /* show_if_empty */ true);
+                      /*has_more_button=*/false,
+                      /*show_if_empty=*/true);
 }
 
 void NTPSnippetsService::DismissSuggestion(
     const ContentSuggestion::ID& suggestion_id) {
   if (!ready())
     return;
 
   DCHECK(base::ContainsKey(categories_, suggestion_id.category()));
 
   CategoryContent* content = &categories_[suggestion_id.category()];
@@ skipping 500 matching lines @@
     // TODO(jkrcal): Fetching snippets automatically upon creation of this
     // lazily created service can cause troubles, e.g. in unit tests where
     // network I/O is not allowed.
     // Either add a DCHECK here that we actually are allowed to do network I/O
     // or change the logic so that some explicit call is always needed for the
     // network request.
     FetchSnippets(/*interactive_request=*/false);
     fetch_when_ready_ = false;
   }
 
-  // FetchSnippets should set the status to |AVAILABLE_LOADING| if relevant,
-  // otherwise we transition to |AVAILABLE| here.
-  if (categories_[articles_category_].status !=
-      CategoryStatus::AVAILABLE_LOADING) {
-    UpdateCategoryStatus(articles_category_, CategoryStatus::AVAILABLE);
+  for (const auto& item : categories_) {

[Marc Treib, 2016/10/14 13:47:14]

This was the actual problem - I missed updating one of the places where we
treated ARTICLES specially.

+    Category category = item.first;
+    const CategoryContent& content = item.second;
+    // FetchSnippets has set the status to |AVAILABLE_LOADING| if relevant,
+    // otherwise we transition to |AVAILABLE| here.
+    if (content.status != CategoryStatus::AVAILABLE_LOADING)
+      UpdateCategoryStatus(category, CategoryStatus::AVAILABLE);
   }
 }
 
 void NTPSnippetsService::EnterStateDisabled() {
   NukeAllSnippets();
 }
 
 void NTPSnippetsService::EnterStateError() {
   snippets_status_service_.reset();
 }
@@ skipping 246 matching lines @@
 }
 
 NTPSnippetsService::CategoryContent::CategoryContent() = default;
 NTPSnippetsService::CategoryContent::CategoryContent(CategoryContent&&) =
     default;
 NTPSnippetsService::CategoryContent::~CategoryContent() = default;
 NTPSnippetsService::CategoryContent& NTPSnippetsService::CategoryContent::
 operator=(CategoryContent&&) = default;
 
 }  // namespace ntp_snippets