Restore favicons to chrome://extensions and chrome://bookmarks page (among probably other things).

chrome/browser/history/history_backend.cc

 // Copyright (c) 2011 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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1698 matching lines @@
             icon_url, icon_types, &favicon.icon_type);
     if (favicon_id) {
       scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
       favicon.known_icon = true;
       Time last_updated;
       if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data,
                                     NULL)) {
         favicon.expired = (Time::Now() - last_updated) >
             TimeDelta::FromDays(kFaviconRefetchDays);
         favicon.image_data = data;
+        favicon.icon_type = history::FAVICON;

[michaelbai, 2011/06/09 15:49:44]

The favicon.icon_type should be returned from line 1708. Did you see the
favicon.icon_type was zero?

       }
 
       if (page_url)
         SetFaviconMapping(*page_url, favicon_id, favicon.icon_type);
     }
     // else case, haven't cached entry yet. Caller is responsible for
     // downloading the favicon and invoking SetFavicon.
   }
   request->ForwardResult(GetFaviconRequest::TupleType(
                              request->handle(), favicon));
@@ skipping 17 matching lines @@
     scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
     if (thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings) &&
         (icon_mappings.front().icon_type & icon_types) &&
         thumbnail_db_->GetFavicon(icon_mappings.front().icon_id, &last_updated,
                                   &data->data, &favicon.icon_url)) {
       favicon.known_icon = true;
       favicon.expired = (Time::Now() - last_updated) >
           TimeDelta::FromDays(kFaviconRefetchDays);
       favicon.icon_type = icon_mappings.front().icon_type;
       favicon.image_data = data;
+      favicon.icon_type = history::FAVICON;

[michaelbai, 2011/06/09 15:49:44]

The favicon.icon_type should be set in line 1755.

[Finnur, 2011/06/09 16:01:57]

Ah, yes. You are right. I'll remove this file entirely from the CL.

     }
 
     UMA_HISTOGRAM_TIMES("History.GetFavIconForURL",  // historical name
                         TimeTicks::Now() - beginning_time);
   }
 
   request->ForwardResult(
       GetFaviconRequest::TupleType(request->handle(), favicon));
 }
 
@@ skipping 480 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history