Remove preferences among favicon types when choosing large icons

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

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/history/favicon_view_provider.h"
 
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 65 matching lines @@
 
 class FaviconViewProviderTest : public PlatformTest {
  protected:
   void SetUp() override {
     DCHECK_CURRENTLY_ON(web::WebThread::UI);
     PlatformTest::SetUp();
     large_icon_service_.reset(new favicon::LargeIconService(
         &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_;
   testing::StrictMock<favicon::MockFaviconService> mock_favicon_service_;
   std::unique_ptr<favicon::LargeIconService> large_icon_service_;
   base::CancelableTaskTracker cancelable_task_tracker_;
 };
 
 // Tests that image is set when a favicon is returned from LargeIconService.
 TEST_F(FaviconViewProviderTest, Favicon) {
@@ skipping 11 matching lines @@
     EXPECT_NSNE(nil, viewProvider.favicon);
   };
   [[[mock_delegate stub] andDo:confirmationBlock]
       faviconViewProviderFaviconDidLoad:viewProvider];
   EXPECT_OCMOCK_VERIFY(mock_delegate);
 }
 
 // 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)];
   base::scoped_nsobject<FaviconViewProvider> item([[FaviconViewProvider alloc]
            initWithURL:GURL(kTestFallbackURL)
            faviconSize:kTestFaviconSize
         minFaviconSize:kTestFaviconSize
       largeIconService:large_icon_service_.get()
               delegate:mock_delegate]);
 
@@ skipping 11 matching lines @@
     EXPECT_NSEQ(defaultText, viewProvider.fallbackText);
     EXPECT_NSEQ(defaultTextColor, viewProvider.fallbackTextColor);
     EXPECT_NSEQ(defaultBackgroundColor, viewProvider.fallbackBackgroundColor);
   };
   [[[mock_delegate stub] andDo:confirmationBlock]
       faviconViewProviderFaviconDidLoad:item];
   EXPECT_OCMOCK_VERIFY(mock_delegate);
 }
 
 }  // namespace