Introduce dedicated enum value for icons from Web Manifests

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 20 matching lines @@
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 namespace favicon {
 namespace {
 
 using favicon_base::FAVICON;
 using favicon_base::FaviconRawBitmapResult;
 using favicon_base::TOUCH_ICON;
 using favicon_base::TOUCH_PRECOMPOSED_ICON;
+using favicon_base::WEB_MANIFEST_ICON;
 using testing::AnyNumber;
 using testing::Assign;
 using testing::Contains;
 using testing::ElementsAre;
 using testing::InSequence;
 using testing::Invoke;
 using testing::IsEmpty;
 using testing::Not;
 using testing::Return;
 using testing::_;
@@ skipping 1433 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerManifestsEnabledTest);
 };
 
 // Test that a favicon corresponding to a web manifest is reported when:
 // - There is data in the favicon database for the manifest URL.
 // AND
 // - FaviconService::OnFaviconDataForManifestFromFaviconService() runs before
 //   FaviconHandler::OnUpdateCandidates() is called.
 TEST_F(FaviconHandlerManifestsEnabledTest,
        GetFaviconFromManifestInHistoryIfCandidatesSlower) {
-  favicon_service_.fake()->Store(kPageURL, kManifestURL,
-                                 CreateRawBitmapResult(kManifestURL));
+  favicon_service_.fake()->Store(
+      kPageURL, kManifestURL,
+      CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON));
 
   EXPECT_CALL(favicon_service_, UnableToDownloadFavicon(_)).Times(0);
 
   EXPECT_CALL(favicon_service_,
-              UpdateFaviconMappingsAndFetch(_, kManifestURL, FAVICON,
+              UpdateFaviconMappingsAndFetch(_, kManifestURL, WEB_MANIFEST_ICON,
                                             /*desired_size_in_dip=*/16, _, _));
   EXPECT_CALL(delegate_,
               OnFaviconUpdated(_, FaviconDriverObserver::NON_TOUCH_16_DIP,
                                kManifestURL, _, _));
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL12x12}, kManifestURL);
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kManifestURL));
   EXPECT_THAT(delegate_.downloads(), IsEmpty());
 }
 
 // Test that a favicon corresponding to a web manifest is reported when:
 // - There is data in the favicon database for the manifest URL.
 // AND
 // - FaviconHandler::OnUpdateCandidates() is called before
 //   FaviconService::OnFaviconDataForManifestFromFaviconService() runs.
 TEST_F(FaviconHandlerManifestsEnabledTest,
        GetFaviconFromManifestInHistoryIfCandidatesFaster) {
-  favicon_service_.fake()->Store(kPageURL, kManifestURL,
-                                 CreateRawBitmapResult(kManifestURL));
+  favicon_service_.fake()->Store(
+      kPageURL, kManifestURL,
+      CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON));
   // Defer the database lookup completion to control the exact timing.
   favicon_service_.fake()->SetRunCallbackManuallyForUrl(kManifestURL);
 
   EXPECT_CALL(favicon_service_, UnableToDownloadFavicon(_)).Times(0);
 
   EXPECT_CALL(favicon_service_,
-              UpdateFaviconMappingsAndFetch(_, kManifestURL, FAVICON,
+              UpdateFaviconMappingsAndFetch(_, kManifestURL, WEB_MANIFEST_ICON,
                                             /*desired_size_in_dip=*/16, _, _));
   EXPECT_CALL(delegate_,
               OnFaviconUpdated(_, FaviconDriverObserver::NON_TOUCH_16_DIP,
                                kManifestURL, _, _));
 
   std::unique_ptr<FaviconHandler> handler =
       RunHandlerWithSimpleFaviconCandidates({kIconURL12x12}, kManifestURL);
   ASSERT_TRUE(favicon_service_.fake()->HasPendingManualCallback());
 
   // Complete the lookup.
   EXPECT_TRUE(favicon_service_.fake()->RunCallbackManually());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kManifestURL));
   EXPECT_THAT(delegate_.downloads(), IsEmpty());
 }
 
 // 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.
 TEST_F(FaviconHandlerManifestsEnabledTest, GetFaviconFromUnknownManifest) {
   const std::vector<favicon::FaviconURL> kManifestIcons = {
       FaviconURL(kIconURL16x16, FAVICON, kEmptySizes),
   };
 
   delegate_.fake_manifest_downloader().Add(kManifestURL, kManifestIcons);
 
   EXPECT_CALL(favicon_service_, UnableToDownloadFavicon(_)).Times(0);
 
-  EXPECT_CALL(favicon_service_, SetFavicons(_, kManifestURL, FAVICON, _));
+  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 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, FAVICON,
-                                                       /*expired=*/true));
+  favicon_service_.fake()->Store(
+      kPageURL, kManifestURL,
+      CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON,
+                            /*expired=*/true));
   delegate_.fake_manifest_downloader().Add(kManifestURL, kManifestIcons);
 
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kManifestURL, _, _)).Times(2);
   EXPECT_CALL(favicon_service_, SetFavicons(_, kManifestURL, _, _));
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL12x12}, kManifestURL);
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kManifestURL));
   EXPECT_THAT(delegate_.downloads(), ElementsAre(kManifestURL, kIconURL64x64));
 }
 
 // Test that the manifest and icon are redownloaded if the icon cached for the
 // manifest URL expired, which was observed during a visit to a different page
 // URL.
 TEST_F(FaviconHandlerManifestsEnabledTest,
        GetFaviconFromExpiredManifestLinkedFromOtherPage) {
   const GURL kSomePreviousPageURL("https://www.google.com/previous");
   const std::vector<favicon::FaviconURL> kManifestIcons = {
       FaviconURL(kIconURL64x64, FAVICON, kEmptySizes),
   };
 
-  favicon_service_.fake()->Store(kSomePreviousPageURL, kManifestURL,
-                                 CreateRawBitmapResult(kManifestURL, FAVICON,
-                                                       /*expired=*/true));
+  favicon_service_.fake()->Store(
+      kSomePreviousPageURL, kManifestURL,
+      CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON,
+                            /*expired=*/true));
   delegate_.fake_manifest_downloader().Add(kManifestURL, kManifestIcons);
 
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kManifestURL, _, _)).Times(2);
   EXPECT_CALL(favicon_service_, SetFavicons(_, kManifestURL, _, _));
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL12x12}, kManifestURL);
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               ElementsAre(kPageURL, kManifestURL));
   EXPECT_THAT(delegate_.downloads(), ElementsAre(kManifestURL, kIconURL64x64));
 }
@@ skipping 236 matching lines @@
 // - The page doesn't initially link to a Web Manifest.
 // - The page has an icon URL provided via a <link rel="icon"> tag.
 // - The database does not know about the page URL or icon URL.
 // - While the icon is being downloaded, the page uses Javascript to add a
 //   <link rel="manifest"> tag.
 // - The database has bitmap data for the manifest URL.
 TEST_F(FaviconHandlerManifestsEnabledTest,
        AddKnownManifestViaJavascriptWhileImageDownload) {
   const GURL kSomePreviousPageURL("https://www.google.com/previous");
 
-  favicon_service_.fake()->Store(kSomePreviousPageURL, kManifestURL,
-                                 CreateRawBitmapResult(kManifestURL));
+  favicon_service_.fake()->Store(
+      kSomePreviousPageURL, kManifestURL,
+      CreateRawBitmapResult(kManifestURL, WEB_MANIFEST_ICON));
 
   // Defer the image download completion to control the exact timing.
   delegate_.fake_image_downloader().SetRunCallbackManuallyForUrl(kIconURL16x16);
 
   std::unique_ptr<FaviconHandler> handler =
       RunHandlerWithSimpleFaviconCandidates({kIconURL16x16});
 
   ASSERT_TRUE(VerifyAndClearExpectations());
   ASSERT_TRUE(delegate_.fake_image_downloader().HasPendingManualCallback());
 
@@ skipping 91 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