Applied the IconType.

chrome/browser/ui/search_engines/template_url_table_model.cc

Index: chrome/browser/ui/search_engines/template_url_table_model.cc
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index 59388ab38b1a05bb472c100a2a5b7e1cd98252eb..cc9601c20603f6d8223fbf9778b6d29e8fadbc3e 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -91,20 +91,18 @@ class ModelEntry {
         return;
     }
     load_state_ = LOADING;
-    favicon_service->GetFavicon(favicon_url,
-                   &request_consumer_,
-                   NewCallback(this, &ModelEntry::OnFaviconDataAvailable));
+    favicon_service->GetFavicon(favicon_url, history::FAVICON,
+        &request_consumer_,
+        NewCallback(this, &ModelEntry::OnFaviconDataAvailable));
   }
 
   void OnFaviconDataAvailable(
       FaviconService::Handle handle,
-      bool know_favicon,
-      scoped_refptr<RefCountedMemory> data,
-      bool expired,
-      GURL icon_url) {
+      history::FaviconData favicon) {
     load_state_ = LOADED;
-    if (know_favicon && data.get() &&
-        gfx::PNGCodec::Decode(data->front(), data->size(), &favicon_)) {
+    if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
+                                                    favicon.image_data->size(),
+                                                    &favicon_)) {
       model_->FaviconAvailable(this);
     }
   }