Add FaviconAttributesProvider to ContentSuggestions

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm

 // 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.
 
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/time/time.h"
 #include "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/favicon/favicon_attributes_provider.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_article_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_button_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_expandable_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_favicon_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_stack_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_text_item.h"
@@ skipping 212 matching lines @@
           CSCollectionViewItem* item =
               [self emptyItemForSectionInfo:sectionInfo];
           NSIndexPath* addedIndexPath =
               [self addItem:item toSectionWithIdentifier:sectionIdentifier];
           [indexPaths addObject:addedIndexPath];
         }
         break;
       }
       case ContentSuggestionTypeArticle: {
         ContentSuggestionsArticleItem* articleItem =
-            [[ContentSuggestionsArticleItem alloc]
-                initWithType:ItemTypeForContentSuggestionType(suggestion.type)
-                       title:suggestion.title
-                    subtitle:suggestion.text
-                    delegate:self
-                         url:suggestion.url];
-
-        articleItem.publisher = suggestion.publisher;
-        articleItem.publishDate = suggestion.publishDate;
-
-        articleItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+            [self articleItemForSuggestion:suggestion];
 
         NSIndexPath* addedIndexPath = [self addItem:articleItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
     }
   }
 
   return indexPaths;
@@ skipping 150 matching lines @@
 - (CSCollectionViewItem*)emptyItemForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   ContentSuggestionsTextItem* item =
       [[ContentSuggestionsTextItem alloc] initWithType:ItemTypeEmpty];
   item.text = l10n_util::GetNSString(IDS_NTP_TITLE_NO_SUGGESTIONS);
   item.detailText = sectionInfo.emptyText;
 
   return item;
 }
 
+// Returns an article build with the |suggestion|.
+- (ContentSuggestionsArticleItem*)articleItemForSuggestion:
+    (ContentSuggestion*)suggestion {
+  ContentSuggestionsArticleItem* articleItem =
+      [[ContentSuggestionsArticleItem alloc]
+          initWithType:ItemTypeForContentSuggestionType(suggestion.type)
+                 title:suggestion.title
+              subtitle:suggestion.text
+              delegate:self
+                   url:suggestion.url];
+
+  articleItem.publisher = suggestion.publisher;
+  articleItem.publishDate = suggestion.publishDate;
+
+  articleItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+
+  __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
+  __weak ContentSuggestionsArticleItem* weakItem = articleItem;
+  void (^completionBlock)(FaviconAttributes* attributes) =
+      ^(FaviconAttributes* attributes) {
+        ContentSuggestionsArticleItem* strongItem = weakItem;
+        ContentSuggestionsCollectionUpdater* strongSelf = weakSelf;
+        if (!strongSelf || !strongItem) {
+          return;
+        }
+
+        strongItem.attributes = attributes;
+
+        [strongSelf reconfigure:strongItem];
+      };
+
+  [self.dataSource.attributesProvider

[lpromero, 2017/03/29 13:32:07]

I would abstract this in a data source method. 

[gambard, 2017/03/30 08:07:11]

Done.

+      fetchFaviconAttributesForURL:articleItem.articleURL
+                        completion:completionBlock];
+
+  return articleItem;
+}
+
 // Adds |item| to |sectionIdentifier| section of the model of the
 // CollectionView. Returns the IndexPath of the newly added item.
 - (NSIndexPath*)addItem:(CSCollectionViewItem*)item
     toSectionWithIdentifier:(NSInteger)sectionIdentifier {
   CSCollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
   NSInteger itemNumber = [model numberOfItemsInSection:section];
   [model addItem:item toSectionWithIdentifier:sectionIdentifier];
 
   return [NSIndexPath indexPathForItem:itemNumber inSection:section];
 }
 
+// Reconfigures the |item| in the collection view.
+- (void)reconfigure:(CSCollectionViewItem*)item {
+  CSCollectionViewModel* model =
+      self.collectionViewController.collectionViewModel;
+
+  for (NSInteger sectionNumber = 0; sectionNumber < [model numberOfSections];
+       sectionNumber++) {
+    NSInteger sectionIdentifier =
+        [model sectionIdentifierForSection:sectionNumber];
+    if ([model hasItem:item inSectionWithIdentifier:sectionIdentifier]) {
+      [self.collectionViewController
+          reconfigureCellsForItems:@[ item ]
+           inSectionWithIdentifier:sectionIdentifier];
+    }
+  }
+}
+
 @end