Fetch favicon for ReadingListItem

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/strings/sys_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 246 matching lines @@
         ContentSuggestionsArticleItem* articleItem =
             [self articleItemForSuggestion:suggestion];
 
         NSIndexPath* addedIndexPath = [self addItem:articleItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
       case ContentSuggestionTypeReadingList: {
         ContentSuggestionsReadingListItem* readingListItem =
-            [[ContentSuggestionsReadingListItem alloc]
-                     initWithType:ItemTypeReadingList
-                              url:suggestion.url
-                distillationState:suggestion.readingListExtra.status];
-        readingListItem.title = suggestion.title;
-        readingListItem.subtitle = suggestion.publisher;
-
-        readingListItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+            [self readingListItemForSuggestion:suggestion];
 
         NSIndexPath* addedIndexPath = [self addItem:readingListItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
     }
   }
 
   return indexPaths;
@@ skipping 147 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|.
+// Returns an article built 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 ContentSuggestionsArticleItem* weakItem = articleItem;
+  [self fetchFaviconForItem:articleItem
+                    withURL:articleItem.articleURL
+                   callback:^void(FaviconAttributes* attributes) {
+                     weakItem.attributes = attributes;
+                   }];
+
+  return articleItem;
+}
+
+// Returns a reading list item built with the |suggestion|.
+- (ContentSuggestionsReadingListItem*)readingListItemForSuggestion:
+    (ContentSuggestion*)suggestion {
+  ContentSuggestionsReadingListItem* readingListItem =
+      [[ContentSuggestionsReadingListItem alloc]
+               initWithType:ItemTypeReadingList
+                        url:suggestion.url
+          distillationState:suggestion.readingListExtra.status];
+
+  readingListItem.title = suggestion.title;
+  readingListItem.subtitle = suggestion.publisher;
+
+  readingListItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+
+  __weak ContentSuggestionsReadingListItem* weakItem = readingListItem;
+  [self fetchFaviconForItem:readingListItem
+                    withURL:readingListItem.url
+                   callback:^void(FaviconAttributes* attributes) {
+                     weakItem.attributes = attributes;
+                   }];
+
+  return readingListItem;
+}
+
+// Fetches the favicon associated with the |URL|, call the |callback| with the
+// attributes then reconfigure the |item|.
+- (void)fetchFaviconForItem:(CSCollectionViewItem*)item
+                    withURL:(const GURL&)URL
+                   callback:(void (^)(FaviconAttributes*))callback {
+  if (!callback)
+    return;
+
   __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
-  __weak ContentSuggestionsArticleItem* weakItem = articleItem;
+  __weak CSCollectionViewItem* weakItem = item;
   void (^completionBlock)(FaviconAttributes* attributes) =
       ^(FaviconAttributes* attributes) {
-        ContentSuggestionsArticleItem* strongItem = weakItem;
+        CSCollectionViewItem* strongItem = weakItem;
         ContentSuggestionsCollectionUpdater* strongSelf = weakSelf;
         if (!strongSelf || !strongItem) {
           return;
         }
 
-        strongItem.attributes = attributes;
+        callback(attributes);
 
         [strongSelf reconfigure:strongItem];
       };
 
-  [self.dataSource fetchFaviconAttributesForURL:articleItem.articleURL
-                                     completion:completionBlock];
-
-  return articleItem;
+  [self.dataSource fetchFaviconAttributesForURL:URL completion:completionBlock];
 }
 
 // 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];
@@ skipping 13 matching lines @@
         [model sectionIdentifierForSection:sectionNumber];
     if ([model hasItem:item inSectionWithIdentifier:sectionIdentifier]) {
       [self.collectionViewController
           reconfigureCellsForItems:@[ item ]
            inSectionWithIdentifier:sectionIdentifier];
     }
   }
 }
 
 @end