Applied the IconType.

chrome/browser/jumplist_win.cc

 // Copyright (c) 2010 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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 670 matching lines @@
 bool JumpList::StartLoadingFavIcon() {
   if (icon_urls_.empty())
     return false;
 
   // Ask FaviconService if it has a favicon of a URL.
   // When FaviconService has one, it will call OnFaviconDataAvailable().
   GURL url(icon_urls_.front().first);
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      url, &favicon_consumer_,
+      url, history::FAVICON, &favicon_consumer_,
       NewCallback(this, &JumpList::OnFaviconDataAvailable));
   return true;
 }
 
 void JumpList::OnSegmentUsageAvailable(
     CancelableRequestProvider::Handle handle,
     std::vector<PageUsageData*>* data) {
   // Create a list of ShellLinkItem objects from the given list of
   // PageUsageData objects.
   // The command that opens a web page with chrome is:
@@ skipping 44 matching lines @@
                 &recently_closed_pages_, kRecentlyClosedCount);
     }
   }
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavIcon();
 }
 
 void JumpList::OnFaviconDataAvailable(
     FaviconService::Handle handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   // Attach the received data to the ShellLinkItem object.
   // This data will be decoded by JumpListUpdateTask.
-  if (know_favicon && data.get() && data->size()) {
+  if (favicon.is_valid()) {
     if (!icon_urls_.empty() && icon_urls_.front().second)
-      icon_urls_.front().second->SetIconData(data);
+      icon_urls_.front().second->SetIconData(favicon.image_data);
   }
 
   // if we need to load more favicons, we send another query and exit.
   if (!icon_urls_.empty())
     icon_urls_.pop_front();
   if (StartLoadingFavIcon())
     return;
 
   // Finished loading all favicons needed by the application JumpList.
   // We create a JumpListUpdateTask that creates icon files, and we post it to
   // the file thread.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       new JumpListUpdateTask(app_id_.c_str(), icon_dir_, most_visited_pages_,
                              recently_closed_pages_));
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }