[NTP Snippets] Overwrite the title of the ARTICLES if provided by the server

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 502 matching lines @@
 
   // If snippets were fetched successfully, update our |categories_| from each
   // category provided by the server.
   if (fetched_categories) {
     // TODO(jkrcal): A bit hard to understand with so many variables called
     // "*categor*". Isn't here some room for simplification?
     for (NTPSnippetsFetcher::FetchedCategory& fetched_category :
          *fetched_categories) {
       Category category = fetched_category.category;
 
+      // The ChromeReader backend doesn't provide category titles, so don't
+      // overwrite the existing title for ARTICLES if the new one is empty.
+      // TODO(treib): Remove this check after we fully switch to the content
+      // suggestions backend.
       // TODO(sfiera): Avoid hard-coding articles category checks in so many
       // places.
-      if (category != articles_category_) {
-        // Only update titles from server-side provided categories.
+      if (category != articles_category_ ||
+          !fetched_category.localized_title.empty()) {
         categories_[category].localized_title =
             fetched_category.localized_title;
       }
       categories_[category].provided_by_server = true;
 
       // TODO(tschumann): Remove this histogram once we only talk to the content
       // suggestions cloud backend.
       if (category == articles_category_) {
         UMA_HISTOGRAM_SPARSE_SLOWLY(
             "NewTabPage.Snippets.NumArticlesFetched",
@@ skipping 467 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