Remove preferences among favicon types when choosing large icons

components/favicon/core/favicon_service_impl.cc

 // 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.
 
 #include "components/favicon/core/favicon_service_impl.h"
 
 #include <stddef.h>
 #include <cmath>
 #include <utility>
 
@@ skipping 131 matching lines @@
       page_url, icon_types, desired_sizes_in_pixel,
       base::Bind(
           &FaviconServiceImpl::RunFaviconRawBitmapCallbackWithBitmapResults,
           base::Unretained(this), callback, desired_size_in_pixel),
       tracker);
 }
 
 base::CancelableTaskTracker::TaskId
 FaviconServiceImpl::GetLargestRawFaviconForPageURL(
     const GURL& page_url,
-    const std::vector<int>& icon_types,
-    int minimum_size_in_pixels,
     const favicon_base::FaviconRawBitmapCallback& callback,
     base::CancelableTaskTracker* tracker) {
   TRACE_EVENT0("browser", "FaviconServiceImpl::GetLargestRawFaviconForPageURL");
   favicon_base::FaviconResultsCallback favicon_results_callback = base::Bind(
       &FaviconServiceImpl::RunFaviconRawBitmapCallbackWithBitmapResults,
       base::Unretained(this), callback, 0);
   if (favicon_client_ && favicon_client_->IsNativeApplicationURL(page_url)) {
     std::vector<int> desired_sizes_in_pixel;
     desired_sizes_in_pixel.push_back(0);
     return favicon_client_->GetFaviconForNativeApplicationURL(
         page_url, desired_sizes_in_pixel, favicon_results_callback, tracker);
   }
-  return history_service_->GetLargestFaviconForURL(
-      page_url, icon_types, minimum_size_in_pixels, callback, tracker);
+  return history_service_->GetLargestFaviconForURL(page_url, callback, tracker);
 }
 
 base::CancelableTaskTracker::TaskId FaviconServiceImpl::GetFaviconForPageURL(
     const GURL& page_url,
     int icon_types,
     int desired_size_in_dip,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   TRACE_EVENT0("browser", "FaviconServiceImpl::GetFaviconForPageURL");
   return GetFaviconForPageURLImpl(
@@ skipping 123 matching lines @@
     const std::vector<favicon_base::FaviconRawBitmapResult>&
         favicon_bitmap_results) {
   TRACE_EVENT0(
       "browser",
       "FaviconServiceImpl::RunFaviconRawBitmapCallbackWithBitmapResults");
   callback.Run(
       ResizeFaviconBitmapResult(favicon_bitmap_results, desired_size_in_pixel));
 }
 
 }  // namespace favicon