Use IOSImageDataFetcherWrapper in BrowserViewController

components/image_fetcher/ios/ios_image_data_fetcher_wrapper.mm

 // Copyright 2017 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 "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_runner.h"
@@ skipping 68 matching lines @@
     : task_runner_(task_runner),
       image_data_fetcher_(url_request_context_getter) {
   DCHECK(task_runner_.get());
 }
 
 IOSImageDataFetcherWrapper::~IOSImageDataFetcherWrapper() {}
 
 void IOSImageDataFetcherWrapper::FetchImageDataWebpDecoded(
     const GURL& image_url,
     IOSImageDataFetcherCallback callback) {
+  IOSImageDataFetcherWrapper::FetchImageDataWebpDecoded(
+      image_url, callback, std::string(),
+      net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE);

[Marc Treib, 2017/02/03 14:10:30]

...and a second place where it's baked in.
IMO this is a strong hint that the design with the IosWrapper isn't quite there
yet. Not for this CL, but we should revisit this at some point.

[gambard, 2017/02/03 14:56:47]

I have changed the interface. Maybe it makes more sense now.

[Marc Treib, 2017/02/03 15:06:45]

Yep, I think that's a bit better, thanks!

At some point, we'll still have to re-think the Wrapper: Having a different
ImageDataFetcher interface on iOS makes it impossible to use the same
ImageFetcher implementation across platforms. But that's for another day :)

[gambard, 2017/02/03 15:11:14]

Actually no :)
There are two usages of image fetchers in iOS: those needing access to the raw
data (which will be using this one) and the one needing access to gfx::Image
(which will be using the shared ImageFetcher).
The WebP decoding will be done in the iOS specific ImageDecoder that will be
passed to the ImageFetcher. We discussed it at go/chrome-ios-image-fetchers

+}
+void IOSImageDataFetcherWrapper::FetchImageDataWebpDecoded(

[Marc Treib, 2017/02/03 14:10:30]

nit: empty line before

[gambard, 2017/02/03 14:56:47]

Done.

+    const GURL& image_url,
+    IOSImageDataFetcherCallback callback,
+    const std::string& referrer,
+    net::URLRequest::ReferrerPolicy referrer_policy) {
   DCHECK(callback);
 
   scoped_refptr<base::TaskRunner> task_runner = task_runner_;
   ImageDataFetcher::ImageDataFetcherCallback local_callback =
       base::BindBlockArc(^(const std::string& image_data) {
         // Create a NSData from the returned data and notify the callback.
         NSData* data =
             [NSData dataWithBytes:image_data.data() length:image_data.size()];
 
         if (data.length < 12 ||
             image_data.compare(0, 4, kWEBPFirstMagicPattern) != 0 ||
             image_data.compare(8, 4, kWEBPSecondMagicPattern) != 0) {
           callback(data);
           return;
         }
 
         // The image is a webp image.
         base::PostTaskAndReplyWithResult(task_runner.get(), FROM_HERE,
                                          base::Bind(&DecodeWebpImage, data),
                                          base::BindBlockArc(callback));
       });
-  image_data_fetcher_.FetchImageData(image_url, local_callback);
+  image_data_fetcher_.FetchImageData(image_url, local_callback, referrer,
+                                     referrer_policy);
 }
 
 void IOSImageDataFetcherWrapper::SetDataUseServiceName(
     DataUseServiceName data_use_service_name) {
   image_data_fetcher_.SetDataUseServiceName(data_use_service_name);
 }
 
 }  // namespace image_fetcher