Remove preferences among favicon types when choosing large icons

components/favicon/core/test/mock_favicon_service.h

 // Copyright 2017 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_FAVICON_CORE_TEST_MOCK_FAVICON_SERVICE_H_
 #define COMPONENTS_FAVICON_CORE_TEST_MOCK_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 43 matching lines @@
                    const GURL& page_url,
                    const favicon_base::FaviconImageCallback& callback,
                    base::CancelableTaskTracker* tracker));
   MOCK_METHOD5(GetRawFaviconForPageURL,
                base::CancelableTaskTracker::TaskId(
                    const GURL& page_url,
                    int icon_types,
                    int desired_size_in_pixel,
                    const favicon_base::FaviconRawBitmapCallback& callback,
                    base::CancelableTaskTracker* tracker));
-  MOCK_METHOD5(GetLargestRawFaviconForPageURL,
+  MOCK_METHOD3(GetLargestRawFaviconForPageURL,
                base::CancelableTaskTracker::TaskId(
                    const GURL& page_url,
-                   const std::vector<int>& icon_types,
-                   int minimum_size_in_pixels,
                    const favicon_base::FaviconRawBitmapCallback& callback,
                    base::CancelableTaskTracker* tracker));
   MOCK_METHOD5(GetFaviconForPageURL,
                base::CancelableTaskTracker::TaskId(
                    const GURL& page_url,
                    int icon_types,
                    int desired_size_in_dip,
                    const favicon_base::FaviconResultsCallback& callback,
                    base::CancelableTaskTracker* tracker));
   MOCK_METHOD6(UpdateFaviconMappingsAndFetch,
@@ skipping 30 matching lines @@
                     const gfx::Image& image,
                     base::Callback<void(bool)> callback));
   MOCK_METHOD1(UnableToDownloadFavicon, void(const GURL& icon_url));
   MOCK_CONST_METHOD1(WasUnableToDownloadFavicon, bool(const GURL& icon_url));
   MOCK_METHOD0(ClearUnableToDownloadFavicons, void());
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_TEST_MOCK_FAVICON_SERVICE_H_