components/image_fetcher: Add a from_http_cache flag to RequestMetadata

components/favicon/ios/web_favicon_driver.mm

 // Copyright 2015 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.
 
 #include "components/favicon/ios/web_favicon_driver.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/favicon/ios/favicon_url_util.h"
@@ skipping 59 matching lines @@
 int WebFaviconDriver::DownloadImage(const GURL& url,
                                     int max_image_size,
                                     ImageDownloadCallback callback) {
   static int downloaded_image_count = 0;
   int local_download_id = ++downloaded_image_count;
 
   GURL local_url(url);
 
   image_fetcher::IOSImageDataFetcherCallback local_callback =
       ^(NSData* data, const image_fetcher::RequestMetadata& metadata) {
-        if (metadata.response_code ==
-            image_fetcher::ImageDataFetcher::RESPONSE_CODE_INVALID)
+        if (metadata.http_response_code ==
+            image_fetcher::RequestMetadata::RESPONSE_CODE_INVALID)
           return;
 
         std::vector<SkBitmap> frames;
         std::vector<gfx::Size> sizes;
         if (data) {
           frames = skia::ImageDataToSkBitmaps(data);
           for (const auto& frame : frames) {
             sizes.push_back(gfx::Size(frame.width(), frame.height()));
           }
         }
-        callback.Run(local_download_id, metadata.response_code, local_url,
+        callback.Run(local_download_id, metadata.http_response_code, local_url,
                      frames, sizes);
       };
   image_fetcher_.FetchImageDataWebpDecoded(url, local_callback);
 
   return downloaded_image_count;
 }
 
 bool WebFaviconDriver::IsOffTheRecord() {
   DCHECK(web_state());
   return web_state()->GetBrowserState()->IsOffTheRecord();
@@ skipping 30 matching lines @@
 WebFaviconDriver::~WebFaviconDriver() {
 }
 
 void WebFaviconDriver::FaviconUrlUpdated(
     const std::vector<web::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   OnUpdateFaviconURL(GetActiveURL(), FaviconURLsFromWebFaviconURLs(candidates));
 }
 
 }  // namespace favicon