Use IOSImageDataFetcherWrapper in BrowserViewController

components/image_fetcher/image_data_fetcher.cc

Index: components/image_fetcher/image_data_fetcher.cc
diff --git a/components/image_fetcher/image_data_fetcher.cc b/components/image_fetcher/image_data_fetcher.cc
index 708bf3affda5e8027eccded578519c39d67a2ed2..75ee24f517603c2d23d6dee9068d44c56c769d37 100644
--- a/components/image_fetcher/image_data_fetcher.cc
+++ b/components/image_fetcher/image_data_fetcher.cc
@@ -46,16 +46,28 @@ void ImageDataFetcher::SetDataUseServiceName(
 }
 
 void ImageDataFetcher::FetchImageData(
-    const GURL& url, const ImageDataFetcherCallback& callback) {
-  std::unique_ptr<net::URLFetcher> url_fetcher =
-      net::URLFetcher::Create(
-          next_url_fetcher_id_++, url, net::URLFetcher::GET, this);
+    const GURL& image_url,
+    const ImageDataFetcherCallback& callback) {
+  ImageDataFetcher::FetchImageData(

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

"ImageDataFetcher::" isn't needed.

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

Done.

+      image_url, callback, /*referrer=*/std::string(),
+      net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE);

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

It's unfortunate that we have to bake in the default value here (though the
policy probably just doesn't matter if the referrer itself is empty).

I guess the alternative would be for the other method to take a
base::Optional<ReferrerPolicy> (I think callers could still just pass in a
value, without caring about the Optional), but that probably adds more
confusion. WDYT?

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

I agree this not a perfect solution. I would have expected the URLRequest to
expose a static method to have the default.
I find this better than a base::Optional but I don't have a strong opinion on
it.

+}
+
+void ImageDataFetcher::FetchImageData(
+    const GURL& image_url,
+    const ImageDataFetcherCallback& callback,
+    const std::string& referrer,
+    net::URLRequest::ReferrerPolicy referrer_policy) {
+  std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create(
+      next_url_fetcher_id_++, image_url, net::URLFetcher::GET, this);
 
   DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_);
 
   std::unique_ptr<ImageDataFetcherRequest> request(
       new ImageDataFetcherRequest(callback, std::move(url_fetcher)));
   request->url_fetcher->SetRequestContext(url_request_context_getter_.get());
+  request->url_fetcher->SetReferrer(referrer);
+  request->url_fetcher->SetReferrerPolicy(referrer_policy);
   request->url_fetcher->Start();
 
   pending_requests_[request->url_fetcher.get()] = std::move(request);