Support touch icon in FaviconHelper

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 5313cf0503289e154957c57a31a83ba44be6018f..1ffed15a95938ff5027c81ed6dbebfe89026af98 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -408,9 +408,16 @@ void PrerenderContents::OnDidRedirectProvisionalLoad(int32 page_id,
     Destroy(FINAL_STATUS_HTTPS);
 }
 
-void PrerenderContents::OnUpdateFaviconURL(int32 page_id,
-                                           const GURL& icon_url) {
-  icon_url_ = icon_url;
+void PrerenderContents::OnUpdateFaviconURL(
+    int32 page_id,
+    const std::vector<FaviconURL>& urls) {
+  for (std::vector<FaviconURL>::const_iterator i = urls.begin();
+       i != urls.end(); ++i) {
+    if (i->icon_type == FAVICON) {
+      icon_url_ = i->icon_url;
+      return;
+    }
+  }
 }
 
 bool PrerenderContents::AddAliasURL(const GURL& url) {