Support touch icon in FaviconHelper

chrome/browser/prerender/prerender_contents.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/prerender/prerender_contents.h"
 
 #include "base/process_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
@@ skipping 391 matching lines @@
 }
 
 void PrerenderContents::OnDidRedirectProvisionalLoad(int32 page_id,
                                                      const GURL& source_url,
                                                      const GURL& target_url) {
   if (!AddAliasURL(target_url))
     Destroy(FINAL_STATUS_HTTPS);
 }
 
 void PrerenderContents::OnUpdateFaviconURL(int32 page_id,
-                                           const GURL& icon_url) {
-  icon_url_ = icon_url;
+                                           std::vector<FaviconURL> urls) {
+  for (std::vector<FaviconURL>::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) {
   if (!url.SchemeIs("http"))
     return false;
   alias_urls_.push_back(url);
   return true;
 }
 
 bool PrerenderContents::MatchesURL(const GURL& url) const {
@@ skipping 44 matching lines @@
     return;
 
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
     if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024)
       Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
   }
 }
 
 }  // namespace prerender