Applied the IconType.

chrome/browser/ui/search_engines/template_url_table_model.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/ui/search_engines/template_url_table_model.h"
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 73 matching lines @@
       // The favicon url isn't always set. Guess at one here.
       if (template_url_.url() && template_url_.url()->IsValid()) {
         GURL url = GURL(template_url_.url()->url());
         if (url.is_valid())
           favicon_url = TemplateURL::GenerateFaviconURL(url);
       }
       if (!favicon_url.is_valid())
         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);
     }
   }
 
   const TemplateURL& template_url_;
   SkBitmap favicon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
@@ skipping 254 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLModelChanged() {
   Reload();
 }