Add FaviconAttributesProvider to ContentSuggestions

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/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/sys_string_conversions.h"
+#include "components/favicon/core/large_icon_service.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_category_wrapper.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_service_bridge_observer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_image_fetcher.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestion_identifier.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
+#import "ios/chrome/browser/ui/favicon/favicon_attributes_provider.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 
+// Size of the favicon returned by the provider.
+const CGFloat kDefaultFaviconSize = 16;
+
 // TODO(crbug.com/701275): Once base::BindBlock supports the move semantics,
 // remove this wrapper.
 // Wraps a callback taking a const ref to a callback taking an object.
 void BindWrapper(
     base::Callback<void(ntp_snippets::Status status_code,
                         const std::vector<ntp_snippets::ContentSuggestion>&
                             suggestions)> callback,
     ntp_snippets::Status status_code,
     std::vector<ntp_snippets::ContentSuggestion> suggestions) {
   if (callback) {
@@ skipping 84 matching lines @@
   // Bridge for this class to become an observer of a ContentSuggestionsService.
   std::unique_ptr<ContentSuggestionsServiceBridge> _suggestionBridge;
 }
 
 @property(nonatomic, assign)
     ntp_snippets::ContentSuggestionsService* contentService;
 @property(nonatomic, strong, nonnull)
     NSMutableDictionary<ContentSuggestionsCategoryWrapper*,
                         ContentSuggestionsSectionInformation*>*
         sectionInformationByCategory;
+// FaviconAttributesProvider to fetch the favicon for the suggestions.
+@property(nonatomic, nullable, strong)

[lpromero, 2017/03/31 08:30:26]

Optional nit: Could be nonnull.

[gambard, 2017/04/03 12:34:34]

Yes but I think it is ok as is.

+    FaviconAttributesProvider* attributesProvider;
 
 // Converts the |suggestions| from |category| to ContentSuggestion 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
                toArray:(NSMutableArray<ContentSuggestion*>*)contentArray;
 
 // Adds the section information for |category| in
 // self.sectionInformationByCategory.
 - (void)addSectionInformationForCategory:(ntp_snippets::Category)category;
 
 // Returns a CategoryWrapper acting as a key for this section info.
 - (ContentSuggestionsCategoryWrapper*)categoryWrapperForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo;
 
 @end
 
 @implementation ContentSuggestionsMediator
 
 @synthesize contentService = _contentService;
 @synthesize dataSink = _dataSink;
 @synthesize sectionInformationByCategory = _sectionInformationByCategory;
+@synthesize attributesProvider = _attributesProvider;
 
 #pragma mark - Public
 
-- (instancetype)initWithContentService:
-    (ntp_snippets::ContentSuggestionsService*)contentService {
+- (instancetype)
+initWithContentService:(ntp_snippets::ContentSuggestionsService*)contentService
+      largeIconService:(favicon::LargeIconService*)largeIconService {
   self = [super init];
   if (self) {
     _suggestionBridge =
         base::MakeUnique<ContentSuggestionsServiceBridge>(self, contentService);
     _contentService = contentService;
     _sectionInformationByCategory = [[NSMutableDictionary alloc] init];
+    _attributesProvider = [[FaviconAttributesProvider alloc]
+        initWithFaviconSize:kDefaultFaviconSize
+             minFaviconSize:1
+           largeIconService:largeIconService];
   }
   return self;
 }
 
 - (void)dismissSuggestion:(ContentSuggestionIdentifier*)suggestionIdentifier {
   ContentSuggestionsCategoryWrapper* categoryWrapper =
       [self categoryWrapperForSectionInfo:suggestionIdentifier.sectionInfo];
   ntp_snippets::ContentSuggestion::ID suggestion_id =
       ntp_snippets::ContentSuggestion::ID([categoryWrapper category],
                                           suggestionIdentifier.IDInSection);
@@ skipping 56 matching lines @@
           const std::vector<ntp_snippets::ContentSuggestion>& suggestions) {
         [weakSelf didFetchMoreSuggestions:suggestions
                            withStatusCode:status
                                  callback:callback];
       }));
 
   self.contentService->Fetch([wrapper category], known_suggestion_ids,
                              serviceCallback);
 }
 
+- (void)fetchFaviconAttributesForURL:(const GURL&)URL
+                          completion:(void (^)(FaviconAttributes*))completion {
+  [self.attributesProvider fetchFaviconAttributesForURL:URL
+                                             completion:completion];
+}
+
 #pragma mark - ContentSuggestionsServiceObserver
 
 - (void)contentSuggestionsService:
             (ntp_snippets::ContentSuggestionsService*)suggestionsService
          newSuggestionsInCategory:(ntp_snippets::Category)category {
   ContentSuggestionsCategoryWrapper* wrapper =
       [ContentSuggestionsCategoryWrapper wrapperWithCategory:category];
   if (!self.sectionInformationByCategory[wrapper]) {
     [self addSectionInformationForCategory:category];
   }
@@ skipping 122 matching lines @@
         [NSMutableArray array];
     ntp_snippets::Category category = suggestions[0].id().category();
     [self addSuggestions:suggestions
             fromCategory:category
                  toArray:contentSuggestions];
     callback(contentSuggestions);
   }
 }
 
 @end