Revert of 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"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/interstitials/web_interstitial_impl.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/session_storage_builder.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/crw_session_storage.h"
+#import "ios/web/public/image_fetcher/image_data_fetcher.h"
 #import "ios/web/public/java_script_dialog_presenter.h"
 #import "ios/web/public/navigation_item.h"
 #include "ios/web/public/url_util.h"
 #import "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #include "ios/web/public/web_state/credential.h"
 #import "ios/web/public/web_state/ui/crw_content_view.h"
 #import "ios/web/public/web_state/web_state_delegate.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 #import "ios/web/public/web_state/web_state_policy_decider.h"
 #include "ios/web/public/web_thread.h"
 #include "ios/web/public/webui/web_ui_ios_controller.h"
 #include "ios/web/web_state/global_web_state_event_tracker.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
 #include "ios/web/web_state/web_state_facade_delegate.h"
 #include "ios/web/webui/web_ui_ios_controller_factory_registry.h"
 #include "ios/web/webui/web_ui_ios_impl.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
+#include "skia/ext/skia_utils_ios.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace web {
 
 /* static */
 std::unique_ptr<WebState> WebState::Create(const CreateParams& params) {
   std::unique_ptr<WebStateImpl> web_state(
       new WebStateImpl(params.browser_state));
 
   // Initialized the new session.
   NSString* window_name = nil;
@@ skipping 38 matching lines @@
     SessionStorageBuilder session_storage_builder;
     session_storage_builder.ExtractSessionState(this, session_storage);
   } else {
     navigation_manager_.reset(new NavigationManagerImpl());
   }
   navigation_manager_->SetDelegate(this);
   navigation_manager_->SetBrowserState(browser_state);
   // Send creation event and create the web controller.
   GlobalWebStateEventTracker::GetInstance()->OnWebStateCreated(this);
   web_controller_.reset([[CRWWebController alloc] initWithWebState:this]);
+  // Set up the image fetcher.
+  image_fetcher_ =
+      base::MakeUnique<ImageDataFetcher>(web::WebThread::GetBlockingPool());
+  image_fetcher_->SetRequestContextGetter(browser_state->GetRequestContext());
 }
 
 WebStateImpl::~WebStateImpl() {
   [web_controller_ close];
   is_being_destroyed_ = true;
 
   // WebUI depends on web state so it must be destroyed first in case any WebUI
   // implementations depends on accessing web state during destruction.
   ClearWebUI();
 
@@ skipping 438 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