Remove preferences among favicon types when choosing large icons

components/favicon/core/large_icon_service_unittest.cc

 // 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 "components/favicon/core/large_icon_service.h"
 
 #include <deque>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 279 matching lines @@
     if (fallback_style) {
       returned_fallback_style_ =
           base::MakeUnique<favicon_base::FallbackIconStyle>(*fallback_style);
     }
   }
 
   void InjectMockResult(
       const GURL& page_url,
       const favicon_base::FaviconRawBitmapResult& mock_result) {
     ON_CALL(mock_favicon_service_,
-            GetLargestRawFaviconForPageURL(page_url, _, _, _, _))
-        .WillByDefault(PostReply<5>(mock_result));
+            GetLargestRawFaviconForPageURL(page_url, _, _))
+        .WillByDefault(PostReply<3>(mock_result));
   }
 
  protected:
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   std::unique_ptr<favicon_base::FallbackIconStyle> returned_fallback_style_;
   std::unique_ptr<gfx::Size> returned_bitmap_size_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LargeIconServiceGetterTest);
@@ skipping 73 matching lines @@
 
 // Every test will appear with suffix /0 (param false) and /1 (param true), e.g.
 //  LargeIconServiceGetterTest.FallbackSinceTooPicky/0: get image.
 //  LargeIconServiceGetterTest.FallbackSinceTooPicky/1: get raw bitmap.
 INSTANTIATE_TEST_CASE_P(,  // Empty instatiation name.
                         LargeIconServiceGetterTest,
                         ::testing::Values(false, true));
 
 }  // namespace
 }  // namespace favicon