Identify MostVisited by item instead of URL

ios/chrome/browser/content_suggestions/content_suggestions_mediator.mm

 // Copyright 2017 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/content_suggestions/content_suggestions_mediator.h"
 
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
@@ skipping 35 matching lines @@
 
 @interface ContentSuggestionsMediator ()<ContentSuggestionsImageFetcher,
                                          ContentSuggestionsServiceObserver,
                                          MostVisitedSitesObserving> {
   // Bridge for this class to become an observer of a ContentSuggestionsService.
   std::unique_ptr<ContentSuggestionsServiceBridge> _suggestionBridge;
   std::unique_ptr<ntp_tiles::MostVisitedSites> _mostVisitedSites;
   std::unique_ptr<ntp_tiles::MostVisitedSitesObserverBridge> _mostVisitedBridge;
 }
 
-// Most visited data from the MostVisitedSites service (copied upon receiving
+// Most visited items from the MostVisitedSites service (copied upon receiving
 // the callback).
-@property(nonatomic, assign) std::vector<ntp_tiles::NTPTile> mostVisitedData;
+@property(nonatomic, strong)
+    NSMutableArray<ContentSuggestionsMostVisitedItem*>* mostVisitedItems;
 // Section Info for the Most Visited section.
 @property(nonatomic, strong)
     ContentSuggestionsSectionInformation* mostVisitedSectionInfo;
 // Whether the page impression has been recorded.
 @property(nonatomic, assign) BOOL recordedPageImpression;
 // The ContentSuggestionsService, serving suggestions.
 @property(nonatomic, assign)
     ntp_snippets::ContentSuggestionsService* contentService;
 // Map the section information created to the relevant category.
 @property(nonatomic, strong, nonnull)
     NSMutableDictionary<ContentSuggestionsCategoryWrapper*,
                         ContentSuggestionsSectionInformation*>*
         sectionInformationByCategory;
 // FaviconAttributesProvider to fetch the favicon for the suggestions.
 @property(nonatomic, nullable, strong)
     FaviconAttributesProvider* attributesProvider;
 
 @end
 
 @implementation ContentSuggestionsMediator
 
-@synthesize mostVisitedData = _mostVisitedData;
+@synthesize mostVisitedItems = _mostVisitedItems;
 @synthesize mostVisitedSectionInfo = _mostVisitedSectionInfo;
 @synthesize recordedPageImpression = _recordedPageImpression;
 @synthesize contentService = _contentService;
 @synthesize dataSink = _dataSink;
 @synthesize sectionInformationByCategory = _sectionInformationByCategory;
 @synthesize attributesProvider = _attributesProvider;
 @synthesize commandHandler = _commandHandler;
 
 #pragma mark - Public
 
@@ skipping 32 matching lines @@
 
   self.contentService->DismissSuggestion(suggestion_id);
 }
 
 #pragma mark - ContentSuggestionsDataSource
 
 - (NSArray<ContentSuggestionsSectionInformation*>*)sectionsInfo {
   NSMutableArray<ContentSuggestionsSectionInformation*>* sectionsInfo =
       [NSMutableArray array];
 
-  if (!self.mostVisitedData.empty()) {
+  if (self.mostVisitedItems.count > 0) {
     [sectionsInfo addObject:self.mostVisitedSectionInfo];
   }
 
   std::vector<ntp_snippets::Category> categories =
       self.contentService->GetCategories();
 
   for (auto& category : categories) {
     ContentSuggestionsCategoryWrapper* categoryWrapper =
         [ContentSuggestionsCategoryWrapper wrapperWithCategory:category];
     if (!self.sectionInformationByCategory[categoryWrapper]) {
       [self addSectionInformationForCategory:category];
     }
     [sectionsInfo addObject:self.sectionInformationByCategory[categoryWrapper]];
   }
 
   return sectionsInfo;
 }
 
 - (NSArray<CSCollectionViewItem*>*)itemsForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   NSMutableArray<CSCollectionViewItem*>* convertedSuggestions =
       [NSMutableArray array];
 
   if (sectionInfo == self.mostVisitedSectionInfo) {
-    for (const ntp_tiles::NTPTile& tile : self.mostVisitedData) {
-      [convertedSuggestions
-          addObject:ConvertNTPTile(tile, self.mostVisitedSectionInfo)];
-    }
+    [convertedSuggestions addObjectsFromArray:self.mostVisitedItems];
   } else {
     ntp_snippets::Category category =
         [[self categoryWrapperForSectionInfo:sectionInfo] category];
 
     const std::vector<ntp_snippets::ContentSuggestion>& suggestions =
         self.contentService->GetSuggestionsForCategory(category);
     [self addSuggestions:suggestions
             fromCategory:category
              toItemArray:convertedSuggestions];
   }
@@ skipping 184 matching lines @@
         }
 
         callback([image.ToUIImage() copy]);
       }));
 }
 
 #pragma mark - MostVisitedSitesObserving
 
 - (void)onMostVisitedURLsAvailable:
     (const ntp_tiles::NTPTilesVector&)mostVisited {
-  self.mostVisitedData = mostVisited;
+  self.mostVisitedItems = [NSMutableArray array];
+  for (const ntp_tiles::NTPTile& tile : mostVisited) {
+    [self.mostVisitedItems
+        addObject:ConvertNTPTile(tile, self.mostVisitedSectionInfo)];
+  }
+
   [self.dataSink reloadSection:self.mostVisitedSectionInfo];
 
   if (mostVisited.size() && !self.recordedPageImpression) {
     self.recordedPageImpression = YES;
     RecordPageImpression(mostVisited);
   }
 }
 
 - (void)onIconMadeAvailable:(const GURL&)siteURL {
-  [self.dataSink faviconAvailableForURL:siteURL];
+  for (ContentSuggestionsMostVisitedItem* item in self.mostVisitedItems) {
+    if (item.URL == siteURL) {
+      [self.dataSink faviconAvailableForItem:item];
+      return;
+    }
+  }
 }
 
 #pragma mark - Private
 
 // Converts the |suggestions| from |category| to CSCollectionViewItem and adds
 // them to the |contentArray| if the category is available.
 - (void)addSuggestions:
             (const std::vector<ntp_snippets::ContentSuggestion>&)suggestions
           fromCategory:(ntp_snippets::Category&)category
            toItemArray:(NSMutableArray<CSCollectionViewItem*>*)itemArray {
@@ skipping 55 matching lines @@
 }
 
 // Returns whether the |sectionInfo| is associated with a category from the
 // content suggestions service.
 - (BOOL)isRelatedToContentSuggestionsService:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   return sectionInfo != self.mostVisitedSectionInfo;
 }
 
 @end