Use IOSImageDataFetcherWrapper in BrowserViewController

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 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/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 18 matching lines @@
 #import "base/mac/scoped_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/reading_list/core/reading_list_switches.h"
 #include "components/reading_list/ios/reading_list_model.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/core/tab_restore_service_helper.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/toolbar/toolbar_model_impl.h"
 #include "ios/chrome/app/tests_hook.h"
@@ skipping 111 matching lines @@
 #include "ios/public/provider/chrome/browser/ui/default_ios_web_view_factory.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar_owner.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller_delegate.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #include "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/active_state_manager.h"
-#include "ios/web/public/image_fetcher/image_data_fetcher.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer_util.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #import "ios/web/public/web_state/crw_web_view_proxy.h"
 #import "ios/web/public/web_state/ui/crw_native_content_provider.h"
 #include "ios/web/public/web_state/web_state.h"
@@ skipping 257 matching lines @@
   std::unique_ptr<InfoBarContainerIOS> _infoBarContainer;
 
   // Bridge class to deliver container change notifications to BVC.
   std::unique_ptr<InfoBarContainerDelegateIOS> _infoBarContainerDelegate;
 
   // Voice search bar at the bottom of the view overlayed on |_contentArea|
   // when displaying voice search results.
   base::scoped_nsprotocol<UIView<VoiceSearchBar>*> _voiceSearchBar;
 
   // The image fetcher used to save images and perform image-based searches.
-  std::unique_ptr<web::ImageDataFetcher> _imageFetcher;
+  std::unique_ptr<image_fetcher::IOSImageDataFetcherWrapper> _imageFetcher;
 
   // Card side swipe view.
   base::scoped_nsobject<CardSideSwipeView> _sideSwipeView;
 
   // Used to cache value of |hasModeToggleSwitch| if set before the tab strip
   // controller has been created.
   BOOL _modeToggleNeedsSetting;
 
   // Dominant color cache. Key: (NSString*)url, val: (UIColor*)dominantColor.
   base::scoped_nsobject<NSMutableDictionary> _dominantColorCache;
@@ skipping 439 matching lines @@
 
 - (instancetype)initWithTabModel:(TabModel*)model
                     browserState:(ios::ChromeBrowserState*)browserState
                dependencyFactory:
                    (BrowserViewControllerDependencyFactory*)factory {
   self = [super initWithNibName:nil bundle:base::mac::FrameworkBundle()];
   if (self) {
     DCHECK(factory);
     _propertyReleaser_BrowserViewController.Init(self,
                                                  [BrowserViewController class]);
-    _imageFetcher = base::MakeUnique<web::ImageDataFetcher>(
-        web::WebThread::GetBlockingPool());
     _dependencyFactory.reset([factory retain]);
     _nativeControllersForTabIDs.reset(
         [[NSMapTable strongToWeakObjectsMapTable] retain]);
     _dialogPresenter.reset([[DialogPresenter alloc] initWithDelegate:self
                                             presentingViewController:self]);
     _javaScriptDialogPresenter.reset(
         new JavaScriptDialogPresenterImpl(_dialogPresenter));
     _webStateDelegate.reset(new web::WebStateDelegateBridge(self));
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
@@ skipping 731 matching lines @@
   if (!_isOffTheRecord) {
     [DefaultIOSWebViewFactory
         registerWebViewFactory:[ChromeWebViewFactory class]];
   }
   NSUInteger count = [_model count];
   for (NSUInteger index = 0; index < count; ++index)
     [self installDelegatesForTab:[_model tabAtIndex:index]];
 
   [self registerForNotifications];
 
-  _imageFetcher->SetRequestContextGetter(_browserState->GetRequestContext());
+  _imageFetcher = base::MakeUnique<image_fetcher::IOSImageDataFetcherWrapper>(
+      _browserState->GetRequestContext(), web::WebThread::GetBlockingPool());
   _dominantColorCache.reset([[NSMutableDictionary alloc] init]);
 
   // Register for bookmark changed notification (BookmarkModel may be null
   // during testing, so explicitly support this).
   _bookmarkModel = ios::BookmarkModelFactory::GetForBrowserState(_browserState);
   if (_bookmarkModel) {
     _bookmarkModelBridge.reset(new BrowserBookmarkModelBridge(self));
     _bookmarkModel->AddObserver(_bookmarkModelBridge.get());
   }
 }
@@ skipping 1375 matching lines @@
     }
   }
 }
 
 #pragma mark - Context menu methods
 
 - (void)searchByImageAtURL:(const GURL&)url
                   referrer:(const web::Referrer)referrer {
   DCHECK(url.is_valid());
   base::WeakNSObject<BrowserViewController> weakSelf(self);
-  web::ImageFetchedCallback callback =
-      ^(const GURL& original_url, int response_code, NSData* data) {
-        GURL originalURL(original_url.spec());
-        DCHECK(data);
-        dispatch_async(dispatch_get_main_queue(), ^{
-          [weakSelf searchByImageData:data atURL:originalURL];
-        });
-      };
-  _imageFetcher->StartDownload(
+  const GURL image_source_url = url;
+  image_fetcher::IOSImageDataFetcherCallback callback = ^(NSData* data) {
+    DCHECK(data);
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [weakSelf searchByImageData:data atURL:image_source_url];
+    });
+  };
+  _imageFetcher->FetchImageDataWebpDecoded(
       url, callback, web::ReferrerHeaderValueForNavigation(url, referrer),
       web::PolicyForNavigation(url, referrer));
 }
 
 - (void)searchByImageData:(NSData*)data atURL:(const GURL&)imageURL {
   NSData* imageData = data;
   UIImage* image = [UIImage imageWithData:imageData];
   // Downsize the image if its area exceeds kSearchByImageMaxImageArea AND
   // (either its width exceeds kSearchByImageMaxImageWidth OR its height exceeds
   // kSearchByImageMaxImageHeight).
@@ skipping 29 matching lines @@
       search_args, templateUrlService->search_terms_data(), &post_content));
   [self addSelectedTabWithURL:result
                      postData:&post_content
                    transition:ui::PAGE_TRANSITION_TYPED];
 }
 
 - (void)saveImageAtURL:(const GURL&)url
               referrer:(const web::Referrer&)referrer {
   DCHECK(url.is_valid());
 
-  web::ImageFetchedCallback callback =
-      ^(const GURL& original_url, int response_code, NSData* data) {
-        DCHECK(data);
+  image_fetcher::IOSImageDataFetcherCallback callback = ^(NSData* data) {
+    DCHECK(data);
 
-        [self managePermissionAndSaveImage:data];
-      };
-  _imageFetcher->StartDownload(
+    [self managePermissionAndSaveImage:data];
+  };
+  _imageFetcher->FetchImageDataWebpDecoded(
       url, callback, web::ReferrerHeaderValueForNavigation(url, referrer),
       web::PolicyForNavigation(url, referrer));
 }
 
 - (void)managePermissionAndSaveImage:(NSData*)data {
   switch ([PHPhotoLibrary authorizationStatus]) {
     // User was never asked for permission to access photos.
     case PHAuthorizationStatusNotDetermined:
       [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
         // Call -saveImage again to check if chrome needs to display an error or
@@ skipping 2037 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end