Desktop PWAs: Support webp icons for PWA promotability

InstallableManager now supports webp icons for desktop PWA installs,
in addition to png and svg icons.

TBR=mmenke@chromium.org

Bug: 466958
Change-Id: I47fe3ae5c4d96fabba7dbc2d839d8e299df47355
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942904
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721884}

chrome/browser/banners/app_banner_manager_browsertest.cc

@@ -270,6 +270,14 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerSvgIcon) {
                 base::nullopt);
 }
 
+IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerWebPIcon) {
+  std::unique_ptr<AppBannerManagerTest> manager(
+      CreateAppBannerManager(browser()));
+  RunBannerTest(browser(), manager.get(),
+                GetBannerURLWithManifest("/banners/manifest_webp_icon.json"),
+                base::nullopt);
+}
+
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, NoManifest) {
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));

chrome/browser/installable/installable_logging.cc

@@ -28,15 +28,15 @@ static const char kManifestDisplayNotSupportedMessage[] =
     "Manifest 'display' property must be one of 'standalone', 'fullscreen', or "
     "'minimal-ui'";
 static const char kManifestMissingSuitableIconMessage[] =
-    "Manifest does not contain a suitable icon - PNG or SVG format of at least "
-    "%dpx is required, the sizes attribute must be set, and the purpose "
+    "Manifest does not contain a suitable icon - PNG, SVG or WebP format of at "
+    "least %dpx is required, the sizes attribute must be set, and the purpose "
     "attribute, if set, must include \"any\" or \"maskable\".";
 static const char kNoMatchingServiceWorkerMessage[] =
     "No matching service worker detected. You may need to reload the page, or "
     "check that the service worker for the current page also controls the "
     "start URL from the manifest";
 static const char kNoAcceptableIconMessage[] =
-    "No supplied icon is at least %dpx square in PNG or SVG format";
+    "No supplied icon is at least %dpx square in PNG, SVG or WebP format";
 static const char kCannotDownloadIconMessage[] =
     "Could not download a required icon from the manifest";
 static const char kNoIconAvailableMessage[] =

chrome/browser/installable/installable_manager.cc

@@ -103,8 +103,10 @@ struct ImageTypeDetails {
 constexpr ImageTypeDetails kSupportedImageTypes[] = {
     {".png", "image/png"},
 // TODO(https://crbug.com/578122): Add SVG support for Android.
+// TODO(https://crbug.com/466958): Add WebP support for Android.
 #if !defined(OS_ANDROID)
     {".svg", "image/svg+xml"},
+    {".webp", "image/webp"},
 #endif
 };
 

chrome/browser/installable/installable_manager_unittest.cc

@@ -173,6 +173,34 @@ TEST_F(InstallableManagerUnitTest, ManifestSupportsImageSVG) {
 #endif
 }
 
+TEST_F(InstallableManagerUnitTest, ManifestSupportsImageWebP) {
+  blink::Manifest manifest = GetValidManifest();
+
+  manifest.icons[0].type = base::ASCIIToUTF16("image/webp");
+  manifest.icons[0].src = GURL("http://example.com/");
+// TODO(https://crbug.com/466958): Add WebP support for Android.
+#if defined(OS_ANDROID)
+  EXPECT_FALSE(IsManifestValid(manifest));
+  EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode());
+#else
+  EXPECT_TRUE(IsManifestValid(manifest));
+  EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
+#endif
+
+  // If the type is null, the icon src is checked instead.
+  // Case is ignored.
+  manifest.icons[0].type.clear();
+  manifest.icons[0].src = GURL("http://example.com/icon.wEBp");
+// TODO(https://crbug.com/466958): Add WebP support for Android.
+#if defined(OS_ANDROID)
+  EXPECT_FALSE(IsManifestValid(manifest));
+  EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode());
+#else
+  EXPECT_TRUE(IsManifestValid(manifest));
+  EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
+#endif
+}
+
 TEST_F(InstallableManagerUnitTest, ManifestRequiresPurposeAny) {
   blink::Manifest manifest = GetValidManifest();
 

chrome/test/data/banners/manifest_webp_icon.json

+{
+  "name": "WebP test app",
+  "icons": [
+    {
+      "src": "webp-icon.webp",
+      "sizes": "192x192",
+      "type": "image/webp"
+    }
+  ],
+  "start_url": "manifest_test_page.html",
+  "display": "standalone",
+  "orientation": "landscape"
+}

net/test/embedded_test_server/request_handler_util.cc

@@ -58,6 +58,8 @@ std::string GetContentType(const base::FilePath& path) {
     return "text/plain";
   if (path.MatchesExtension(FILE_PATH_LITERAL(".wav")))
     return "audio/wav";
+  if (path.MatchesExtension(FILE_PATH_LITERAL(".webp")))
+    return "image/webp";
   if (path.MatchesExtension(FILE_PATH_LITERAL(".xml")))
     return "text/xml";
   if (path.MatchesExtension(FILE_PATH_LITERAL(".mhtml")))