Use IOSImageDataFetcherWrapper for favicon

ios/web/web_state/web_state_impl.mm

 // Copyright 2013 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/web/web_state/web_state_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 547 matching lines @@
 bool WebStateImpl::ShouldAllowResponse(NSURLResponse* response) {
   for (auto& policy_decider : policy_deciders_) {
     if (!policy_decider.ShouldAllowResponse(response))
       return false;
   }
   return true;
 }
 
 #pragma mark - RequestTracker management
 
-int WebStateImpl::DownloadImage(
-    const GURL& url,
-    bool is_favicon,
-    uint32_t max_bitmap_size,
-    bool bypass_cache,
-    const ImageDownloadCallback& callback) {
-  // |is_favicon| specifies whether the download of the image occurs with
-  // cookies or not. Currently, only downloads without cookies are supported.
-  // |bypass_cache| is ignored since the downloads never go through a cache.
-  DCHECK(is_favicon);
-
-  static int downloaded_image_count = 0;
-  int local_download_id = ++downloaded_image_count;
-  __block web::WebState::ImageDownloadCallback local_image_callback = callback;
-  __block GURL local_url(url);
-  ImageFetchedCallback local_callback =
-      ^(const GURL&, const int response_code, NSData* data) {
-        std::vector<SkBitmap> frames;
-        std::vector<gfx::Size> sizes;
-        if (data) {
-          frames = skia::ImageDataToSkBitmaps(data);
-          for (auto& frame : frames) {
-            sizes.push_back(gfx::Size(frame.width(), frame.height()));
-          }
-        }
-        if (response_code != net::URLFetcher::RESPONSE_CODE_INVALID) {
-          local_image_callback.Run(local_download_id, response_code, local_url,
-                                   frames, sizes);
-        }
-      };
-  image_fetcher_->StartDownload(url, local_callback);
-  return downloaded_image_count;
-}
-
 service_manager::InterfaceRegistry* WebStateImpl::GetMojoInterfaceRegistry() {
   if (!mojo_interface_registry_) {
     mojo_interface_registry_ =
         base::MakeUnique<service_manager::InterfaceRegistry>(std::string());
   }
   return mojo_interface_registry_.get();
 }
 
 base::WeakPtr<WebState> WebStateImpl::AsWeakPtr() {
   return weak_factory_.GetWeakPtr();
@@ skipping 155 matching lines @@
     const LoadCommittedDetails& load_details) {
   for (auto& observer : observers_)
     observer.NavigationItemCommitted(load_details);
 }
 
 WebState* WebStateImpl::GetWebState() {
   return this;
 }
 
 }  // namespace web