Remove preferences among favicon types when choosing large icons

ios/chrome/app/spotlight/spotlight_manager_unittest.mm

 // Copyright 2015 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 <memory>
 
 #import <CoreSpotlight/CoreSpotlight.h>
 #import <Foundation/Foundation.h>
 
 #include "base/location.h"
@@ skipping 55 matching lines @@
  protected:
   SpotlightManagerTest() {
     model_ = bookmarks::TestBookmarkClient::CreateModel();
     large_icon_service_.reset(new favicon::LargeIconService(
         &mock_favicon_service_, base::ThreadTaskRunnerHandle::Get(),
         /*image_fetcher=*/nullptr));
     bookmarksSpotlightManager_ = [[BookmarksSpotlightManager alloc]
         initWithLargeIconService:large_icon_service_.get()
                    bookmarkModel:model_.get()];
 
-    EXPECT_CALL(mock_favicon_service_,
-                GetLargestRawFaviconForPageURL(_, _, _, _, _))
-        .WillRepeatedly(PostReply<5>(CreateTestBitmap(24, 24)));
+    EXPECT_CALL(mock_favicon_service_, GetLargestRawFaviconForPageURL(_, _, _))
+        .WillRepeatedly(PostReply<3>(CreateTestBitmap(24, 24)));
   }
 
   base::MessageLoop loop_;
   testing::StrictMock<favicon::MockFaviconService> mock_favicon_service_;
   std::unique_ptr<favicon::LargeIconService> large_icon_service_;
   base::CancelableTaskTracker cancelable_task_tracker_;
   std::unique_ptr<bookmarks::BookmarkModel> model_;
   BookmarksSpotlightManager* bookmarksSpotlightManager_;
 };
 
@@ skipping 78 matching lines @@
   NSSet* spotlightManagerKeywords =
       [NSSet setWithArray:[[item attributeSet] keywords]];
   EXPECT_TRUE([spotlightManagerKeywords count] > 0);
   // Check static/hardcoded keywords exist
   NSSet* hardCodedKeywordsSet =
       [NSSet setWithArray:ios::GetChromeBrowserProvider()
                               ->GetSpotlightProvider()
                               ->GetAdditionalKeywords()];
   EXPECT_TRUE([hardCodedKeywordsSet isSubsetOfSet:spotlightManagerKeywords]);
 }