Prefer 192x192 icons from Web Manifests instead of 144x144

components/favicon/core/favicon_handler_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/favicon/core/favicon_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 1549 matching lines @@
   EXPECT_CALL(favicon_service_,
               SetFavicons(_, kManifestURL, WEB_MANIFEST_ICON, _));
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kManifestURL, _, _));
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL12x12}, kManifestURL);
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kManifestURL));
   EXPECT_THAT(delegate_.downloads(), ElementsAre(kManifestURL, kIconURL16x16));
 }
 
+// Test that a favicon corresponding to a web manifest is reported when there is
+// data in the database for neither the page URL nor the manifest URL.

[pkotwicz, 2017/06/21 18:03:43]

The comment seems to be unrelated to the test

[mastiz, 2017/06/23 10:29:36]

Done, thanks for catching.

+TEST_F(FaviconHandlerManifestsEnabledTest, Prefer192x192IconFromManifest) {
+  const GURL kIconURL144x144 = GURL("http://www.google.com/favicon144x144");
+  const GURL kIconURL192x192 = GURL("http://www.google.com/favicon192x192");
+
+  delegate_.fake_image_downloader().Add(kIconURL144x144, IntVector{144});
+  delegate_.fake_image_downloader().Add(kIconURL192x192, IntVector{192});
+
+  const std::vector<favicon::FaviconURL> kManifestIcons = {
+      FaviconURL(kIconURL144x144, WEB_MANIFEST_ICON,
+                 SizeVector(1U, gfx::Size(144, 144))),
+      FaviconURL(kIconURL192x192, WEB_MANIFEST_ICON,
+                 SizeVector(1U, gfx::Size(192, 192))),
+  };
+
+  delegate_.fake_manifest_downloader().Add(kManifestURL, kManifestIcons);
+
+  RunHandlerWithCandidates(
+      FaviconDriverObserver::TOUCH_LARGEST,
+      {
+          FaviconURL(kIconURL12x12, TOUCH_ICON, kEmptySizes),
+          FaviconURL(kIconURL64x64, TOUCH_ICON, kEmptySizes),
+      },

[pkotwicz, 2017/06/21 18:03:43]

Can the |candidates| be empty? 

[mastiz, 2017/06/23 10:29:36]

Done.

+      kManifestURL);
+
+  EXPECT_THAT(delegate_.downloads(),
+              ElementsAre(kManifestURL, kIconURL192x192));
+}
+
 // Test that the manifest and icon are redownloaded if the icon cached for the
 // page URL expired.
 TEST_F(FaviconHandlerManifestsEnabledTest, GetFaviconFromExpiredManifest) {
   const std::vector<favicon::FaviconURL> kManifestIcons = {
       FaviconURL(kIconURL64x64, FAVICON, kEmptySizes),
   };
 
   favicon_service_.fake()->Store(
       kPageURL, kManifestURL,
       CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON,
@@ skipping 386 matching lines @@
 
   // Complete the download.
   EXPECT_CALL(favicon_service_, SetFavicons(_, kManifestURL2, _, _));
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kManifestURL2, _, _));
   EXPECT_TRUE(delegate_.fake_image_downloader().RunCallbackManually());
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 }  // namespace favicon