components/image_fetcher: Expose RequestMetadata from ImageFetcher

components/image_fetcher/image_fetcher_impl.h

 // Copyright 2014 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 COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_
 #define COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 32 matching lines @@
   void SetImageFetcherDelegate(ImageFetcherDelegate* delegate) override;
 
   // Sets a service name against which to track data usage.
   void SetDataUseServiceName(DataUseServiceName data_use_service_name) override;
 
   void SetDesiredImageFrameSize(const gfx::Size& size) override;
 
   void StartOrQueueNetworkRequest(
       const std::string& id,
       const GURL& image_url,
-      base::Callback<void(const std::string&, const gfx::Image&)> callback)
-      override;
+      const ImageFetcherCallback& callback) override;
 
   ImageDecoder* GetImageDecoder() override;
 
  private:
-  using CallbackVector =
-      std::vector<base::Callback<void(const std::string&, const gfx::Image&)>>;
-
   // State related to an image fetch (id, pending callbacks).
   struct ImageRequest {
     ImageRequest();
     ImageRequest(const ImageRequest& other);
     ~ImageRequest();
 
     void swap(ImageRequest* other) {
       std::swap(id, other->id);
       std::swap(callbacks, other->callbacks);
     }
 
     std::string id;
     // Queue for pending callbacks, which may accumulate while the request is in
     // flight.
-    CallbackVector callbacks;
+    std::vector<ImageFetcherCallback> callbacks;
   };
 
   using ImageRequestMap = std::map<const GURL, ImageRequest>;
 
   // Processes image URL fetched events. This is the continuation method used
   // for creating callbacks that are passed to the ImageDataFetcher.
   void OnImageURLFetched(const GURL& image_url,
                          const std::string& image_data,
                          const RequestMetadata& metadata);
 
   // Processes image decoded events. This is the continuation method used for
   // creating callbacks that are passed to the ImageDecoder.
-  void OnImageDecoded(const GURL& image_url, const gfx::Image& image);
+  void OnImageDecoded(const GURL& image_url,
+                      const RequestMetadata& metadata,
+                      const gfx::Image& image);
 
   ImageFetcherDelegate* delegate_;
 
   gfx::Size desired_image_frame_size_;
 
   scoped_refptr<net::URLRequestContextGetter> url_request_context_;
 
   std::unique_ptr<ImageDecoder> image_decoder_;
 
   std::unique_ptr<ImageDataFetcher> image_data_fetcher_;
 
   // Map from each image URL to the request information (associated website
   // url, fetcher, pending callbacks).
   ImageRequestMap pending_net_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageFetcherImpl);
 };
 
 }  // namespace image_fetcher
 
 #endif  // COMPONENTS_IMAGE_FETCHER_IMAGE_FETCHER_IMPL_H_