Make FaviconService::GetRawFaviconForPageURL() select the best candidate among all the icon types

components/history/core/browser/history_backend_unittest.cc

 // Copyright (c) 2012 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/history/core/browser/history_backend.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 2975 matching lines @@
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::TOUCH_ICON,
                                           GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   EXPECT_EQ(1u, bitmap_results_out.size());
   EXPECT_EQ(favicon_base::TOUCH_ICON, bitmap_results_out[0].icon_type);
   EXPECT_EQ(icon_url2, bitmap_results_out[0].icon_url);
 }
 
+// Test that when GetFaviconsFromDB() is called with multiple icon types that
+// the best favicon bitmap is selected from among all of the icon types.
+TEST_F(HistoryBackendTest, GetFaviconsFromDBMultipleIconTypes) {
+  const GURL page_url("http://www.google.com/");
+  const GURL icon_url1("http://www.google.com/icon1.png");
+  const GURL icon_url2("http://www.google.com/icon2.png");
+
+  std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
+  backend_->SetFavicons(page_url, favicon_base::FAVICON, icon_url1,
+                        {CreateBitmap(SK_ColorBLUE, kSmallEdgeSize)});
+  backend_->SetFavicons(page_url, favicon_base::TOUCH_ICON, icon_url2,
+                        {CreateBitmap(SK_ColorBLUE, kLargeEdgeSize)});
+
+  struct TestCase {
+    int desired_edge_size;
+    GURL expected_icon_url;
+  } kTestCases[]{{kSmallEdgeSize, icon_url1}, {kLargeEdgeSize, icon_url2}};
+
+  for (const TestCase& test_case : kTestCases) {
+    std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
+    backend_->GetFaviconsForURL(
+        page_url, favicon_base::FAVICON | favicon_base::TOUCH_ICON,
+        {test_case.desired_edge_size}, &bitmap_results_out);
+
+    ASSERT_EQ(1u, bitmap_results_out.size());
+    EXPECT_EQ(test_case.expected_icon_url, bitmap_results_out[0].icon_url);
+  }
+}
+
 // Test that GetFaviconsFromDB() correctly sets the expired flag for bitmap
 // reults.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBExpired) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon.png");
 
   std::vector<unsigned char> data;
   data.push_back('a');
   scoped_refptr<base::RefCountedBytes> bitmap_data(
       base::RefCountedBytes::TakeVector(&data));
@@ skipping 846 matching lines @@
   backend_->QueryMostVisitedURLs(100, 100, &most_visited);
 
   const base::string16 kSomeTitle;  // Ignored by equality operator.
   EXPECT_THAT(
       most_visited,
       ElementsAre(MostVisitedURL(GURL("http://example1.com"), kSomeTitle),
                   MostVisitedURL(GURL("http://example5.com"), kSomeTitle)));
 }
 
 }  // namespace history