Remove preferences among favicon types when choosing large icons

ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm

Index: ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm
diff --git a/ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm b/ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm
index 6ec3886f61082cd040f568489f8973c2a732f5f3..432f5069058d1af9735d7e0fccfa82b5b0b98c15 100644
--- a/ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm
+++ b/ios/chrome/browser/ui/history/favicon_view_provider_unittest.mm
@@ -83,9 +83,9 @@ class FaviconViewProviderTest : public PlatformTest {
         &mock_favicon_service_, base::ThreadTaskRunnerHandle::Get(),
         /*image_fetcher=*/nullptr));
 
-    EXPECT_CALL(mock_favicon_service_, GetLargestRawFaviconForPageURL(
-                                           GURL(kTestFaviconURL), _, _, _, _))
-        .WillRepeatedly(PostReply<5>(CreateTestBitmap()));
+    EXPECT_CALL(mock_favicon_service_,
+                GetLargestRawFaviconForPageURL(GURL(kTestFaviconURL), _, _))
+        .WillRepeatedly(PostReply<3>(CreateTestBitmap()));
   }
 
   web::TestWebThreadBundle thread_bundle_;
@@ -117,9 +117,9 @@ TEST_F(FaviconViewProviderTest, Favicon) {
 // Tests that fallback data is set when no favicon is returned from
 // LargeIconService.
 TEST_F(FaviconViewProviderTest, FallbackIcon) {
-  EXPECT_CALL(mock_favicon_service_, GetLargestRawFaviconForPageURL(
-                                         GURL(kTestFallbackURL), _, _, _, _))
-      .WillRepeatedly(PostReply<5>(favicon_base::FaviconRawBitmapResult()));
+  EXPECT_CALL(mock_favicon_service_,
+              GetLargestRawFaviconForPageURL(GURL(kTestFallbackURL), _, _))
+      .WillRepeatedly(PostReply<3>(favicon_base::FaviconRawBitmapResult()));
 
   id mock_delegate =
       [OCMockObject mockForProtocol:@protocol(FaviconViewProviderDelegate)];