Make the favicons look visually the same after refreshing

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 <algorithm>
 #include <vector>
@@ skipping 305 matching lines @@
                                    const gfx::Image& image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->GetFavicon().valid = true;
 
   bool icon_url_changed = (entry->GetFavicon().url != icon_url);
   entry->GetFavicon().url = icon_url;
 
   if (image.IsEmpty())
     return;
 
-  entry->GetFavicon().image = image;
+  gfx::Image image_with_adjusted_colorspace = image;
+  FaviconUtil::SetFaviconColorSpace(&image_with_adjusted_colorspace);
+
+  entry->GetFavicon().image = image_with_adjusted_colorspace;
   delegate_->NotifyFaviconUpdated(icon_url_changed);
 }
 
 void FaviconHandler::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
 
   image_urls_.clear();
   favicon_candidate_ = FaviconCandidate();
   for (std::vector<FaviconURL>::const_iterator i = candidates.begin();
@@ skipping 282 matching lines @@
   const int download_id = DownloadFavicon(image_url, image_size, icon_type);
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] =
         DownloadRequest(url, image_url, icon_type);
   }
 
   return download_id;
 }