Remove preferences among favicon types when choosing large icons

components/history/core/browser/history_service.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 658 matching lines @@
   // will be fewer results. If |icon_types| has several types, results for only
   // a single type will be returned in the priority of TOUCH_PRECOMPOSED_ICON,
   // TOUCH_ICON, and FAVICON.
   base::CancelableTaskTracker::TaskId GetFaviconsForURL(
       const GURL& page_url,
       int icon_types,
       const std::vector<int>& desired_sizes,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
-  // Used by FaviconService to find the first favicon bitmap whose width and
-  // height are greater than that of |minimum_size_in_pixels|. This searches
-  // for icons by IconType. Each element of |icon_types| is a bitmask of
-  // IconTypes indicating the types to search for.
-  // If the largest icon of |icon_types[0]| is not larger than
-  // |minimum_size_in_pixel|, the next icon types of
-  // |icon_types| will be searched and so on.
-  // If no icon is larger than |minimum_size_in_pixel|, the largest one of all
-  // icon types in |icon_types| is returned.
-  // This feature is especially useful when some types of icon is preferred as
-  // long as its size is larger than a specific value.
+  // Used by FaviconService to find the largest bitmap for |page_url|.
   base::CancelableTaskTracker::TaskId GetLargestFaviconForURL(
       const GURL& page_url,
-      const std::vector<int>& icon_types,
-      int minimum_size_in_pixels,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Used by the FaviconService to get the favicon bitmap which most closely
   // matches |desired_size| from the favicon with |favicon_id| from the history
   // backend. If |desired_size| is 0, the largest favicon bitmap for
   // |favicon_id| is returned.
   base::CancelableTaskTracker::TaskId GetFaviconForID(
       favicon_base::FaviconID favicon_id,
       int desired_size,
@@ skipping 152 matching lines @@
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_