Make FaviconService::GetRawFaviconForPageURL() select the best candidate among all the icon types

components/history/core/browser/thumbnail_database.h

Index: components/history/core/browser/thumbnail_database.h
diff --git a/components/history/core/browser/thumbnail_database.h b/components/history/core/browser/thumbnail_database.h
index 9f81d41f46daca2f9078e6d7f54a0bd2ea3099dd..e0df5417c822ed1ae1c5809431ee49a129385b3f 100644
--- a/components/history/core/browser/thumbnail_database.h
+++ b/components/history/core/browser/thumbnail_database.h
@@ -129,16 +129,11 @@ class ThumbnailDatabase {
   bool SetFaviconOutOfDate(favicon_base::FaviconID icon_id);
 
   // Returns the id of the entry in the favicon database with the specified url
-  // and icon type. If |required_icon_type| contains multiple icon types and
-  // there are more than one matched icon in database, only one icon will be
-  // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and
-  // FAVICON, and the icon type is returned in icon_type parameter if it is not
-  // NULL.
+  // and icon type.
   // Returns 0 if no entry exists for the specified url.
   favicon_base::FaviconID GetFaviconIDForFaviconURL(
       const GURL& icon_url,
-      int required_icon_type,
-      favicon_base::IconType* icon_type);
+      favicon_base::IconType icon_type);
 
   // Gets the icon_url, icon_type and sizes for the specified |icon_id|.
   bool GetFaviconHeader(favicon_base::FaviconID icon_id,
@@ -170,10 +165,6 @@ class ThumbnailDatabase {
   // not NULL.
 
   // Returns true if there are icon mappings for the given page and icon types.
-  // If |required_icon_types| contains multiple icon types and there is more
-  // than one matched icon type in the database, icons of only a single type
-  // will be returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON,
-  // and FAVICON.
   // The matched icon mappings are returned in the |mapping_data| parameter if
   // it is not NULL.
   bool GetIconMappingsForPageURL(const GURL& page_url,
@@ -181,8 +172,8 @@ class ThumbnailDatabase {
                                  std::vector<IconMapping>* mapping_data);
 
   // Returns true if there is any matched icon mapping for the given page.
-  // All matched icon mappings are returned in descent order of IconType if
-  // mapping_data is not NULL.
+  // The matched icon mappings are returned in the |mapping_data| parameter if
+  // it is not NULL.
   bool GetIconMappingsForPageURL(const GURL& page_url,
                                  std::vector<IconMapping>* mapping_data);