Use the same design for all suggestions

ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.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_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.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_reading_list_item.h"
+#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_commands.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @interface ContentSuggestionsViewController ()
@@ skipping 100 matching lines @@
 #pragma mark - UICollectionViewDelegate
 
 - (void)collectionView:(UICollectionView*)collectionView
     didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
   [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
 
   CollectionViewItem* item =
       [self.collectionViewModel itemAtIndexPath:indexPath];
   switch ([self.collectionUpdater contentSuggestionTypeForItem:item]) {
     case ContentSuggestionTypeReadingList:
-      [self openReadingListItem:item];
-      break;
     case ContentSuggestionTypeArticle:
-      [self openArticle:item];
+      [self openSuggestion:item];
       break;
     case ContentSuggestionTypeMostVisited:
       // TODO(crbug.com/707754): Open the most visited site.
       break;
     case ContentSuggestionTypeEmpty:
       break;
   }
 }
 
 #pragma mark - MDCCollectionViewStylingDelegate
@@ skipping 30 matching lines @@
                      insetForSectionAtIndex:indexPath.section];
 
   return [MDCCollectionViewCell
       cr_preferredHeightForWidth:CGRectGetWidth(collectionView.bounds) -
                                  inset.left - inset.right
                          forItem:item];
 }
 
 #pragma mark - Private
 
-// Opens the Reading List entry associated with |item|. |item| must be a
-// ContentSuggestionsReadingListItem.
-- (void)openReadingListItem:(CollectionViewItem*)item {
-  ContentSuggestionsReadingListItem* readingListItem =
-      base::mac::ObjCCastStrict<ContentSuggestionsReadingListItem>(item);
-  [self.suggestionCommandHandler openURL:readingListItem.url];
-}
-
 // Opens the article associated with |item|. |item| must be a
-// ContentSuggestionsArticleItem.
-- (void)openArticle:(CollectionViewItem*)item {
-  ContentSuggestionsArticleItem* article =
-      base::mac::ObjCCastStrict<ContentSuggestionsArticleItem>(item);
-  [self.suggestionCommandHandler openURL:article.articleURL];
+// ContentSuggestionsItem.
+- (void)openSuggestion:(CollectionViewItem*)item {
+  ContentSuggestionsItem* suggestion =
+      base::mac::ObjCCastStrict<ContentSuggestionsItem>(item);
+  [self.suggestionCommandHandler openURL:suggestion.URL];
 }
 
 - (void)handleLongPress:(UILongPressGestureRecognizer*)gestureRecognizer {
   if (self.editor.editing ||
       gestureRecognizer.state != UIGestureRecognizerStateBegan) {
     return;
   }
 
   CGPoint touchLocation =
       [gestureRecognizer locationOfTouch:0 inView:self.collectionView];
   NSIndexPath* touchedItemIndexPath =
       [self.collectionView indexPathForItemAtPoint:touchLocation];
   if (!touchedItemIndexPath ||
       ![self.collectionViewModel hasItemAtIndexPath:touchedItemIndexPath]) {
     // Make sure there is an item at this position.
     return;
   }
   CollectionViewItem* touchedItem =
       [self.collectionViewModel itemAtIndexPath:touchedItemIndexPath];
 
   if ([self.collectionUpdater contentSuggestionTypeForItem:touchedItem] !=
       ContentSuggestionTypeArticle) {
     // Only trigger context menu on articles.
     return;
   }
 
-  ContentSuggestionsArticleItem* articleItem =
-      base::mac::ObjCCastStrict<ContentSuggestionsArticleItem>(touchedItem);
+  ContentSuggestionsItem* suggestionItem =
+      base::mac::ObjCCastStrict<ContentSuggestionsItem>(touchedItem);
 
   [self.suggestionCommandHandler
-      displayContextMenuForArticle:articleItem
+      displayContextMenuForArticle:suggestionItem
                            atPoint:touchLocation
                        atIndexPath:touchedItemIndexPath];
 }
 
 // Checks if the |section| is empty and add an empty element if it is the case.
 // Must be called from inside a performBatchUpdates: block.
 - (void)addEmptySectionPlaceholderIfNeeded:(NSInteger)section {
   if ([self.collectionViewModel numberOfItemsInSection:section] > 0)
     return;
 
   NSIndexPath* emptyItem =
       [self.collectionUpdater addEmptyItemForSection:section];
   [self.collectionView insertItemsAtIndexPaths:@[ emptyItem ]];
 }
 
 @end