[Image fetcher] Add Content-Location header to image_fetcher::RequestMetadata

components/image_fetcher/core/image_data_fetcher.cc

 // Copyright 2016 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/image_fetcher/core/image_data_fetcher.h"
 
 #include <utility>
 
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 using data_use_measurement::DataUseUserData;
 
+namespace {
+
+const char kContentLocationHeader[] = "Content-Location";
+
+}  // namespace
+
 namespace image_fetcher {
 
 // An active image URL fetcher request. The struct contains the related requests
 // state.
 struct ImageDataFetcher::ImageDataFetcherRequest {
   ImageDataFetcherRequest(const ImageDataFetcherCallback& callback,
                           std::unique_ptr<net::URLFetcher> url_fetcher)
       : callback(callback), url_fetcher(std::move(url_fetcher)) {}
 
   ~ImageDataFetcherRequest() {}
@@ skipping 53 matching lines @@
 
   pending_requests_[request->url_fetcher.get()] = std::move(request);
 }
 
 void ImageDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(pending_requests_.find(source) != pending_requests_.end());
   bool success = source->GetStatus().status() == net::URLRequestStatus::SUCCESS;
 
   RequestMetadata metadata;
   if (success && source->GetResponseHeaders()) {
-    metadata.http_response_headers = source->GetResponseHeaders();
     source->GetResponseHeaders()->GetMimeType(&metadata.mime_type);
     metadata.http_response_code = source->GetResponseHeaders()->response_code();
+    // Just read the first value-pair for this header (not caring about |iter|).
+    source->GetResponseHeaders()->EnumerateHeader(
+        /*iter=*/nullptr, kContentLocationHeader,
+        &metadata.content_location_header);
     success &= (metadata.http_response_code == net::HTTP_OK);
   }
   metadata.from_http_cache = source->WasCached();
 
   std::string image_data;
   if (success) {
     source->GetResponseAsString(&image_data);
   }
   FinishRequest(source, metadata, image_data);
 }
@@ skipping 21 matching lines @@
 void ImageDataFetcher::FinishRequest(const net::URLFetcher* source,
                                      const RequestMetadata& metadata,
                                      const std::string& image_data) {
   auto request_iter = pending_requests_.find(source);
   DCHECK(request_iter != pending_requests_.end());
   request_iter->second->callback.Run(image_data, metadata);
   pending_requests_.erase(request_iter);
 }
 
 }  // namespace image_fetcher