Revert of Use IOSImageDataFetcherWrapper for favicon

ios/web/public/web_state/web_state.h

 // 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.
 
 #ifndef IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_H_
 #define IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/web_state/url_verification_constants.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 class GURL;
+class SkBitmap;
 
 @class CRWJSInjectionReceiver;
 @class CRWSessionStorage;
 @protocol CRWScrollableContent;
 @protocol CRWWebViewProxy;
 typedef id<CRWWebViewProxy> CRWWebViewProxyType;
 @class UIView;
 typedef UIView<CRWScrollableContent> CRWContentView;
 
 namespace base {
@@ skipping 42 matching lines @@
     // The disposition requested by the navigation source.
     WindowOpenDisposition disposition;
 
     // The transition type of navigation.
     ui::PageTransition transition;
 
     // Whether this navigation is initiated by the renderer process.
     bool is_renderer_initiated;
   };
 
+  // Callback for |DownloadImage()|.
+  typedef base::Callback<void(
+      int, /* id */
+      int, /* HTTP status code */
+      const GURL&, /* image_url */
+      const std::vector<SkBitmap>&, /* bitmaps */
+      /* The sizes in pixel of the bitmaps before they were resized due to the
+         max bitmap size passed to DownloadImage(). Each entry in the bitmaps
+         vector corresponds to an entry in the sizes vector. If a bitmap was
+         resized, there should be a single returned bitmap. */
+      const std::vector<gfx::Size>&)>
+          ImageDownloadCallback;
+
   // Creates a new WebState.
   static std::unique_ptr<WebState> Create(const CreateParams& params);
   // Creates a new WebState from a serialized NavigationManager.
   static std::unique_ptr<WebState> Create(const CreateParams& params,
                                           CRWSessionStorage* session_storage);
 
   ~WebState() override {}
 
   // Gets/Sets the delegate.
   virtual WebStateDelegate* GetDelegate() = 0;
@@ skipping 124 matching lines @@
   virtual void AddScriptCommandCallback(const ScriptCommandCallback& callback,
                                         const std::string& command_prefix) = 0;
 
   // Removes the callback associated with |command_prefix|.
   virtual void RemoveScriptCommandCallback(
       const std::string& command_prefix) = 0;
 
   // Returns the current CRWWebViewProxy object.
   virtual CRWWebViewProxyType GetWebViewProxy() const = 0;
 
+  // Sends a request to download the given image |url| and returns the unique
+  // id of the download request. When the download is finished, |callback| will
+  // be called with the bitmaps received from the renderer.
+  // If |is_favicon| is true, the cookies are not sent and not accepted during
+  // download.
+  // Bitmaps with pixel sizes larger than |max_bitmap_size| are filtered out
+  // from the bitmap results. If there are no bitmap results <=
+  // |max_bitmap_size|, the smallest bitmap is resized to |max_bitmap_size| and
+  // is the only result. A |max_bitmap_size| of 0 means unlimited.
+  // If |bypass_cache| is true, |url| is requested from the server even if it
+  // is present in the browser cache.
+  virtual int DownloadImage(const GURL& url,
+                            bool is_favicon,
+                            uint32_t max_bitmap_size,
+                            bool bypass_cache,
+                            const ImageDownloadCallback& callback) = 0;
+
   // Returns Mojo interface registry for this WebState.
   virtual service_manager::InterfaceRegistry* GetMojoInterfaceRegistry() = 0;
 
  protected:
   friend class WebStateObserver;
   friend class WebStatePolicyDecider;
 
   // Adds and removes observers for page navigation notifications. The order in
   // which notifications are sent to observers is undefined. Clients must be
   // sure to remove the observer before they go away.
@@ skipping 15 matching lines @@
 
   // Returns a WeakPtr<WebState> to the current WebState. Must remain private
   // and only call must be in WebStateWeakPtrFactory. Please consult that class
   // for more details. Remove as part of http://crbug.com/556736.
   virtual base::WeakPtr<WebState> AsWeakPtr() = 0;
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_PUBLIC_WEB_STATE_WEB_STATE_H_