Fix favicon exact match logic and add test.

chrome/browser/favicon/favicon_handler.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 "chrome/browser/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 31 matching lines @@
   return history::INVALID_ICON;
 }
 
 bool DoUrlAndIconMatch(const FaviconURL& favicon_url,
                        const GURL& url,
                        history::IconType icon_type) {
   return favicon_url.icon_url == url &&
       favicon_url.icon_type == static_cast<FaviconURL::IconType>(icon_type);
 }
 
+std::string UrlWithoutFragment(const GURL& gurl) {
+  std::string url = gurl.spec();

[sky, 2012/03/25 18:46:46]

I believe you want ReplaceComponents.

[stevenjb, 2012/03/25 22:00:15]

So I do, thanks.
Done.

+  std::string::size_type n = url.rfind(gurl.ref());
+  if (n != std::string::npos && n > 0)
+    url = url.substr(0, n-1);  // Trim fragment, including the leading '#'.
+  return url;
+}
+
+bool UrlMatches(const GURL& gurl_a, const GURL& gurl_b) {
+  return UrlWithoutFragment(gurl_a) == UrlWithoutFragment(gurl_b);
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 FaviconHandler::DownloadRequest::DownloadRequest()
     : icon_type(history::INVALID_ICON) {
 }
 
 FaviconHandler::DownloadRequest::~DownloadRequest() {
 }
@@ skipping 85 matching lines @@
 
 FaviconService* FaviconHandler::GetFaviconService() {
   return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,
                                             const GURL& image_url,
                                             const gfx::Image& image,
                                             history::IconType icon_type) {
   bool update_candidate = false;
-  bool exact_match = false;
   SkBitmap bitmap = *(image.ToSkBitmap());
   int bitmap_size = std::max(bitmap.width(), bitmap.height());
+  bool exact_match = (bitmap_size == preferred_icon_size());
   if (preferred_icon_size() == 0) {
+    // No preferred size, use this icon.
     update_candidate = true;
     exact_match = true;
   } else if (favicon_candidate_.icon_type == history::INVALID_ICON) {
     // No current candidate, use this.
     update_candidate = true;
   } else {
     if (bitmap_size == preferred_icon_size()) {
       // Exact match, use this.
       update_candidate = true;
-      exact_match = true;
     } else {
       // Compare against current candidate.
       int cur_size = favicon_candidate_.bitmap_size;
       if ((bitmap_size >= preferred_icon_size() && bitmap_size < cur_size) ||
           (cur_size < preferred_icon_size() && bitmap_size > cur_size)) {
         update_candidate = true;
       }
     }
   }
   if (update_candidate) {
@@ skipping 13 matching lines @@
       (preferred_icon_size() == bitmap.width() &&
        preferred_icon_size() == bitmap.height())) ?
       image : ResizeFaviconIfNeeded(image);
 
   if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     if (gfx::PNGEncodedDataFromImage(sized_image, &image_data))
       SetHistoryFavicon(url, image_url, image_data, icon_type);
   }
 
-  if (url == url_ && icon_type == history::FAVICON) {
+  if (UrlMatches(url, url_) && icon_type == history::FAVICON) {
     NavigationEntry* entry = GetEntry();
     if (entry) {
       entry->GetFavicon().url = image_url;
       UpdateFavicon(entry, &sized_image);
     }
   }
 }
 
 void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    scoped_refptr<RefCountedMemory> data) {
@@ skipping 101 matching lines @@
       // Reset candidate.
       image_urls_.clear();
       favicon_candidate_ = FaviconCandidate();
     }
   }
   download_requests_.erase(i);
 }
 
 NavigationEntry* FaviconHandler::GetEntry() {
   NavigationEntry* entry = delegate_->GetActiveEntry();
-  if (entry && entry->GetURL() == url_)
+  if (entry && UrlMatches(entry->GetURL(), url_))
     return entry;
 
   // If the URL has changed out from under us (as will happen with redirects)
   // return NULL.
   return NULL;
 }
 
 int FaviconHandler::DownloadFavicon(const GURL& image_url, int image_size) {
   if (!image_url.is_valid()) {
     NOTREACHED();
@@ skipping 187 matching lines @@
   int height = bitmap.height();
   if (width > 0 && height > 0) {
     gfx::CalculateFaviconTargetSize(&width, &height);
     return gfx::Image(skia::ImageOperations::Resize(
                           bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
                           width, height));
   }
 
   return image;
 }