Add processing for missing fields in ImageResource

If any of sizes or purpose are missing in ImageResource,
provide default values for 'purpose' and 'sizes'.

Bug: 868875
Change-Id: I2e88144e1d098a18c740ffeaf9a2fb474db031a1
Reviewed-on: https://chromium-review.googlesource.com/c/1244176
Commit-Queue: Jaeyong Bae <jdragon.bae@gmail.com>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Mugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597175}

third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader.cc

@@ -114,10 +114,18 @@ KURL BackgroundFetchIconLoader::PickBestIconForDisplay(
     // Update the src of |icon| to include the base URL in case relative paths
     // were used.
     icon.setSrc(execution_context->CompleteURL(icon.src()));
-    icons.emplace_back(blink::ConvertManifestImageResource(icon));
+    Manifest::ImageResource candidate_icon =
+        blink::ConvertManifestImageResource(icon);
+    // Provide default values for 'purpose' and 'sizes' if they are missing.
+    if (candidate_icon.sizes.empty())
+      candidate_icon.sizes.emplace_back(gfx::Size(0, 0));
+    if (candidate_icon.purpose.empty()) {
+      candidate_icon.purpose.emplace_back(
+          Manifest::ImageResource::Purpose::ANY);
+    }
+    icons.emplace_back(candidate_icon);
   }
 
-  // TODO(crbug.com/868875): Handle cases where `sizes` or `purpose` is empty.
   return KURL(ManifestIconSelector::FindBestMatchingIcon(
       std::move(icons), icon_display_size_pixels_.height, kMinimumIconSizeInPx,
       Manifest::ImageResource::Purpose::ANY));

third_party/blink/renderer/modules/background_fetch/background_fetch_icon_loader_test.cc

@@ -97,12 +97,14 @@ class BackgroundFetchIconLoaderTest : public PageTestBase {
 
   void LoadIcon(const KURL& url,
                 const WebSize& maximum_size,
-                base::OnceClosure quit_closure) {
+                base::OnceClosure quit_closure,
+                const String& sizes = "500x500",
+                const String& purpose = "ANY") {
     ManifestImageResource icon;
     icon.setSrc(url.GetString());
     icon.setType("image/png");
-    icon.setSizes("500x500");
-    icon.setPurpose("ANY");
+    icon.setSizes(sizes);
+    icon.setPurpose(purpose);
     HeapVector<ManifestImageResource> icons(1, icon);
     loader_->icons_ = std::move(icons);
     loader_->DidGetIconDisplaySizeIfSoLoadIcon(
@@ -183,4 +185,34 @@ TEST_F(BackgroundFetchIconLoaderTest, PickRightIcon) {
                             kBackgroundFetchImageLoaderIcon48x48));
 }
 
+TEST_F(BackgroundFetchIconLoaderTest, EmptySizes) {
+  base::RunLoop run_loop;
+
+  WebSize maximum_size{192, 168};
+  LoadIcon(KURL(kBackgroundFetchImageLoaderIcon500x500FullPath), maximum_size,
+           run_loop.QuitClosure(), "", "ANY");
+
+  platform_->GetURLLoaderMockFactory()->ServeAsynchronousRequests();
+
+  run_loop.Run();
+
+  ASSERT_EQ(BackgroundFetchLoadState::kLoadSuccessful, loaded_);
+  ASSERT_FALSE(bitmap_.drawsNothing());
+}
+
+TEST_F(BackgroundFetchIconLoaderTest, EmptyPurpose) {
+  base::RunLoop run_loop;
+
+  WebSize maximum_size{192, 168};
+  LoadIcon(KURL(kBackgroundFetchImageLoaderIcon500x500FullPath), maximum_size,
+           run_loop.QuitClosure(), "500X500", "");
+
+  platform_->GetURLLoaderMockFactory()->ServeAsynchronousRequests();
+
+  run_loop.Run();
+
+  ASSERT_EQ(BackgroundFetchLoadState::kLoadSuccessful, loaded_);
+  ASSERT_FALSE(bitmap_.drawsNothing());
+}
+
 }  // namespace blink