Use URL without fragment when query recent redirect list for favicons.

components/history/core/browser/history_backend.cc

 // Copyright (c) 2012 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/history/core/browser/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 2065 matching lines @@
 
 bool HistoryBackend::SetFaviconMappingsForPageAndRedirects(
     const GURL& page_url,
     favicon_base::IconType icon_type,
     const std::vector<favicon_base::FaviconID>& icon_ids) {
   if (!thumbnail_db_)
     return false;
 
   // Find all the pages whose favicons we should set, we want to set it for
   // all the pages in the redirect chain if it redirected.
-  RedirectList redirects;
+  RedirectList redirects, extra_redirects;
   GetCachedRecentRedirects(page_url, &redirects);

[sky, 2015/06/16 22:06:23]

If the ref isn't useful when querying for redirects than shouldn't we only do
this call if there is no ref?

[beaudoin, 2015/06/17 16:51:27]

Acknowledged.

+  if (page_url.has_ref()) {
+    // Refs often gets added by Javascript, but the redirect chain is keyed to
+    // the URL without a ref.
+    GURL::Replacements replacements;
+    replacements.ClearRef();
+    GURL page_url_without_ref = page_url.ReplaceComponents(replacements);
+    GetCachedRecentRedirects(page_url_without_ref, &extra_redirects);
+  }
 
   bool mappings_changed = false;
 
   // Save page <-> favicon associations.
   for (RedirectList::const_iterator i(redirects.begin()); i != redirects.end();
        ++i) {
     mappings_changed |= SetFaviconMappingsForPage(*i, icon_type, icon_ids);
   }
+  for (RedirectList::const_iterator i(extra_redirects.begin());

[sky, 2015/06/17 16:07:30]

This is the part I dislike about the current patch and is why I prefer copying
to extra_redirects. That said, I'm ok with what you have if you move 2100-2103
into a common function that both places call.

[beaudoin, 2015/06/17 16:51:27]

Done.

+       i != extra_redirects.end(); ++i) {
+    mappings_changed |= SetFaviconMappingsForPage(*i, icon_type, icon_ids);
+  }
   return mappings_changed;
 }
 
 bool HistoryBackend::SetFaviconMappingsForPage(
     const GURL& page_url,
     favicon_base::IconType icon_type,
     const std::vector<favicon_base::FaviconID>& icon_ids) {
   DCHECK_LE(icon_ids.size(), kMaxFaviconsPerPage);
   bool mappings_changed = false;
 
@@ skipping 544 matching lines @@
   return true;
 }
 
 HistoryClient* HistoryBackend::GetHistoryClient() {
   if (history_client_)
     history_client_->BlockUntilBookmarksLoaded();
   return history_client_;
 }
 
 }  // namespace history