[LargeIconService] Store downloaded icons under original URL

components/favicon/core/large_icon_service.cc

 // 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/core/large_icon_service.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/fallback_icon_style.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/favicon_base/favicon_util.h"
+#include "components/image_fetcher/core/request_metadata.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/url_canon.h"
 
 namespace favicon {
 namespace {
 
 const char kGoogleServerV2RequestFormat[] =
     "https://t0.gstatic.com/faviconV2?"
@@ skipping 179 matching lines @@
     return;
   }
   image_callback_.Run(
       favicon_base::LargeIconImageResult(fallback_icon_style_.release()));
 }
 
 void OnFetchIconFromGoogleServerComplete(
     FaviconService* favicon_service,
     const GURL& page_url,
     const base::Callback<void(bool success)>& callback,
     const std::string& icon_url,

[pkotwicz, 2017/04/10 15:12:42]

Maybe rename |icon_url| to |server_request_url| here and in the caller?

[jkrcal, 2017/04/10 15:50:59]

Done.

     const gfx::Image& image,
     const image_fetcher::RequestMetadata& metadata) {
   if (image.IsEmpty()) {
     DLOG(WARNING) << "large icon server fetch empty " << icon_url;
     favicon_service->UnableToDownloadFavicon(GURL(icon_url));
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   base::Bind(callback, false));
     return;
   }
 
-  // TODO(crbug.com/699542): Extract the original icon url from the response
-  // headers if available and use it instead of |icon_url|. Possibly the type
-  // too, because using TOUCH_ICON is a hacky way that allows us to not
-  // interfere with sync.
+  // Get the original favicon URL from Content-Location http header (if given).
+  std::string original_icon_url = metadata.content_location_header;
+  if (original_icon_url.empty()) {
+    original_icon_url = icon_url;  // Use the favicon server url as fallback.
+  }
 
   // Write fetched icons to FaviconService's cache, but only if no icon was
   // available (clients are encouraged to do this in advance, but meanwhile
   // something else could've been written). By marking the icons initially
   // expired (out-of-date), they will be refetched when we visit the original
   // page any time in the future.
-  favicon_service->SetLastResortFavicons(page_url, GURL(icon_url),
+  favicon_service->SetLastResortFavicons(page_url, GURL(original_icon_url),
                                          favicon_base::IconType::TOUCH_ICON,
                                          image, callback);
 }
 
 }  // namespace
 
 LargeIconService::LargeIconService(
     FaviconService* favicon_service,
     const scoped_refptr<base::TaskRunner>& background_task_runner,
     std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher)
@@ skipping 78 matching lines @@
   // TODO(beaudoin): For now this is just a wrapper around
   //   GetLargestRawFaviconForPageURL. Add the logic required to select the best
   //   possible large icon. Also add logic to fetch-on-demand when the URL of
   //   a large icon is known but its bitmap is not available.
   return favicon_service_->GetLargestRawFaviconForPageURL(
       page_url, large_icon_types_, min_source_size_in_pixel,
       base::Bind(&LargeIconWorker::OnIconLookupComplete, worker), tracker);
 }
 
 }  // namespace favicon