Use IOSImageDataFetcherWrapper

ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.mm

 // Copyright (c) 2014 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/omnibox/omnibox_popup_material_view_controller.h"
 
 #include <memory>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#import "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_row.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_view_ios.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
 #import "ios/chrome/browser/ui/omnibox/truncating_attributed_label.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
-#include "ios/web/public/image_fetcher/image_data_fetcher.h"
 #include "net/base/escape.h"
 
 namespace {
 const int kRowCount = 6;
 const CGFloat kRowHeight = 48.0;
 const CGFloat kAnswerRowHeight = 64.0;
 const CGFloat kTopAndBottomPadding = 8.0;
 // The color of the main text of a suggest cell.
 UIColor* SuggestionTextColor() {
   return [UIColor colorWithWhite:(51 / 255.0) alpha:1.0];
@@ skipping 41 matching lines @@
   base::ScopedCFTypeRef<CTFontRef> _bigFont;
   base::ScopedCFTypeRef<CTFontRef> _smallBoldFont;
   base::ScopedCFTypeRef<CTFontRef> _bigBoldFont;
 
   // Alignment of omnibox text. Popup text should match this alignment.
   NSTextAlignment _alignment;
 
   OmniboxPopupViewIOS* _popupView;  // weak, owns us
 
   // Fetcher for Answers in Suggest images.
-  std::unique_ptr<web::ImageDataFetcher> imageFetcher_;
+  std::unique_ptr<image_fetcher::IOSImageDataFetcherWrapper> imageFetcher_;
 
   // The data source.
   AutocompleteResult _currentResult;
 
   // Array containing the OmniboxPopupMaterialRow objects displayed in the view.
   base::scoped_nsobject<NSArray> _rows;
 
   // The height of the keyboard. Used to determine the content inset for the
   // scroll view.
   CGFloat keyboardHeight_;
 }
 
 @end
 
 @implementation OmniboxPopupMaterialViewController
 
 @synthesize incognito = _incognito;
 
 #pragma mark -
 #pragma mark Initialization
 
-- (instancetype)initWithPopupView:(OmniboxPopupViewIOS*)view
-                      withFetcher:
-                          (std::unique_ptr<web::ImageDataFetcher>)imageFetcher {
+- (instancetype)
+initWithPopupView:(OmniboxPopupViewIOS*)view
+      withFetcher:(std::unique_ptr<image_fetcher::IOSImageDataFetcherWrapper>)
+                      imageFetcher {
   if ((self = [super init])) {
     _popupView = view;
     imageFetcher_ = std::move(imageFetcher);
 
     if (IsIPadIdiom()) {
       // The iPad keyboard can cover some of the rows of the scroll view. The
       // scroll view's content inset may need to be updated when the keyboard is
       // displayed.
       NSNotificationCenter* defaultCenter =
           [NSNotificationCenter defaultCenter];
@@ skipping 118 matching lines @@
   row.rowHeight = answerPresent ? kAnswerRowHeight : kRowHeight;
 
   [row.detailTruncatingLabel setTextAlignment:_alignment];
   [row.textTruncatingLabel setTextAlignment:_alignment];
 
   // Fetch the answer image if specified.  Currently, no answer types specify an
   // image on the first line so for now we only look at the second line.
   const BOOL answerImagePresent =
       answerPresent && match.answer->second_line().image_url().is_valid();
   if (answerImagePresent) {
-    web::ImageFetchedCallback callback =
-        ^(const GURL& original_url, int response_code, NSData* data) {
-          if (data) {
-            UIImage* image =
-                [UIImage imageWithData:data scale:[UIScreen mainScreen].scale];
-            if (image) {
-              row.answerImageView.image = image;
-            }
-          }
-        };
-    imageFetcher_->StartDownload(match.answer->second_line().image_url(),
-                                 callback);
+    image_fetcher::IOSImageDataFetcherCallback callback = ^(NSData* data) {
+      if (data) {
+        UIImage* image =
+            [UIImage imageWithData:data scale:[UIScreen mainScreen].scale];
+        if (image) {
+          row.answerImageView.image = image;
+        }
+      }
+    };
+    imageFetcher_->FetchImageDataWebpDecoded(
+        match.answer->second_line().image_url(), callback);
 
     // Answers in suggest do not support RTL, left align only.
     CGFloat imageLeftPadding =
         kTextCellLeadingPadding + kAnswerImageLeftPadding;
     if (alignmentRight) {
       imageLeftPadding =
           row.frame.size.width - (kAnswerImageWidth + kAppendButtonWidth);
     }
     CGFloat imageTopPadding =
         kDetailCellTopPadding + kAnswerRowPadding + kAnswerImageTopPadding;
@@ skipping 527 matching lines @@
     // The delete button never disappears if you don't call this after a tap.
     // It doesn't seem to be required anywhere else.
     [_rows[indexPath.row] prepareForReuse];
     const AutocompleteMatch& match =
         ((const AutocompleteResult&)_currentResult).match_at(indexPath.row);
     _popupView->DeleteMatch(match);
   }
 }
 
 @end