ContentSuggestionsDataSource returns CollectionViewItem

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

 // 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.
 
 #ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_COLLECTION_UPDATER_H_
 #define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_COLLECTION_UPDATER_H_
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
+@class CollectionViewItem;
+@class ContentSuggestionsSectionInformation;
+@class ContentSuggestionsViewController;
+@protocol ContentSuggestionsDataSource;
+@protocol SuggestedContent;
 
-@class CollectionViewItem;
-@protocol ContentSuggestionsDataSource;
-@class ContentSuggestionsViewController;
+// Enum defining the type of a ContentSuggestions.
+typedef NS_ENUM(NSInteger, ContentSuggestionType) {
+  // Use this type to pass information about an empty section. Suggestion of
+  // this type are empty and should not be displayed. The informations to be
+  // displayed are contained in the SectionInfo.
+  ContentSuggestionTypeEmpty,
+  ContentSuggestionTypeArticle,
+  ContentSuggestionTypeReadingList,
+  ContentSuggestionTypeMostVisited,
+};
 
 // Updater for a CollectionViewController populating it with some items and
 // handling the items addition.
 @interface ContentSuggestionsCollectionUpdater : NSObject
 
 // Initialize with the |dataSource| used to get the data.
 - (instancetype)initWithDataSource:(id<ContentSuggestionsDataSource>)dataSource
     NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 
 // |collectionViewController| this Updater will update. Needs to be set before
 // adding items.
 @property(nonatomic, assign)

[jif, 2017/05/15 11:14:47]

should be weak to make it impossible to have a dangling pointer

[gambard, 2017/05/15 12:50:03]

Nice catch!
Done.

     ContentSuggestionsViewController* collectionViewController;
 
 // Returns whether the section should use the default, non-card style.
 - (BOOL)shouldUseCustomStyleForSection:(NSInteger)section;
 
 // Returns the ContentSuggestionType associated with this item.
 - (ContentSuggestionType)contentSuggestionTypeForItem:(CollectionViewItem*)item;
 
 // Adds the sections for the |suggestions| to the model and returns their
 // indices.
-- (NSIndexSet*)addSectionsForSuggestionsToModel:
-    (NSArray<ContentSuggestion*>*)suggestions;
+- (NSIndexSet*)addSectionsForSectionInfoToModel:
+    (NSArray<ContentSuggestionsSectionInformation*>*)sectionsInfo;
 
-// Adds the |suggestions| to the model and returns their index paths.
-// The caller must ensure the corresponding sections have been added to the
-// model.
-- (NSArray<NSIndexPath*>*)addSuggestionsToModel:
-    (NSArray<ContentSuggestion*>*)suggestions;
+// Adds the |suggestions| to the model in the section corresponding to
+// |sectionInfo| and returns their index paths. The caller must ensure the
+// corresponding section has been added to the model.
+- (NSArray<NSIndexPath*>*)
+addSuggestionsToModel:
+    (NSArray<CollectionViewItem<SuggestedContent>*>*)suggestions
+      withSectionInfo:(ContentSuggestionsSectionInformation*)sectionInfo;
 
-// Adds the empty item to this |section| and returns its index path. The updater
+// Adds an empty item to this |section| and returns its index path. The updater
 // does not do any check about the number of elements in the section.
 - (NSIndexPath*)addEmptyItemForSection:(NSInteger)section;
 
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_COLLECTION_UPDATER_H_