Remove unused parameter in GetValidIconUrlsToDownload()

Bug: 926083
Change-Id: Ibb961ead98be58a3cb9079ca5bf8edf0e86001fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1905293
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714140}

chrome/browser/web_applications/components/web_app_install_utils.cc

@@ -153,21 +153,13 @@ void UpdateWebAppInfoFromManifest(const blink::Manifest& manifest,
 }
 
 std::vector<GURL> GetValidIconUrlsToDownload(
-    const WebApplicationInfo& web_app_info,
-    const InstallableData* data) {
-  // Add icon urls to download from the WebApplicationInfo.
+    const WebApplicationInfo& web_app_info) {
   std::vector<GURL> web_app_info_icon_urls;
   for (auto& info : web_app_info.icons) {
     if (!info.url.is_valid())
       continue;
-
-    // Skip downloading icon if we already have it from the InstallableManager.
-    if (data && data->primary_icon && data->primary_icon_url == info.url)
-      continue;
-
     web_app_info_icon_urls.push_back(info.url);
   }
-
   return web_app_info_icon_urls;
 }
 

chrome/browser/web_applications/components/web_app_install_utils.h

@@ -12,7 +12,6 @@
 #include "url/gurl.h"
 
 enum class WebappInstallSource;
-struct InstallableData;
 struct WebApplicationInfo;
 class SkBitmap;
 
@@ -40,12 +39,9 @@ void UpdateWebAppInfoFromManifest(const blink::Manifest& manifest,
                                   WebApplicationInfo* web_app_info,
                                   ForInstallableSite installable_site);
 
-// Form a list of icons to download: Remove icons with invalid urls. If |data|
-// is specified and contains a valid primary icon, we skip downloading any
-// matching icon in |web_app_info|.
+// Form a list of icons to download: Remove icons with invalid urls.
 std::vector<GURL> GetValidIconUrlsToDownload(
-    const WebApplicationInfo& web_app_info,
-    const InstallableData* data);
+    const WebApplicationInfo& web_app_info);
 
 // A map of icon urls to the bitmaps provided by that url.
 using IconsMap = std::map<GURL, std::vector<SkBitmap>>;

chrome/browser/web_applications/web_app_install_task.cc

@@ -232,7 +232,7 @@ void WebAppInstallTask::InstallWebAppFromInfoRetrieveIcons(
   background_installation_ = true;
 
   std::vector<GURL> icon_urls =
-      GetValidIconUrlsToDownload(*web_application_info, /*data=*/nullptr);
+      GetValidIconUrlsToDownload(*web_application_info);
 
   // Skip downloading the page favicons as everything in is the URL list.
   data_retriever_->GetIcons(
@@ -255,7 +255,7 @@ void WebAppInstallTask::UpdateWebAppFromInfo(
   background_installation_ = true;
 
   std::vector<GURL> icon_urls =
-      GetValidIconUrlsToDownload(*web_application_info, /*data=*/nullptr);
+      GetValidIconUrlsToDownload(*web_application_info);
 
   data_retriever_->GetIcons(
       web_contents, std::move(icon_urls),
@@ -462,8 +462,7 @@ void WebAppInstallTask::OnDidPerformInstallableCheck(
     return;
   }
 
-  std::vector<GURL> icon_urls =
-      GetValidIconUrlsToDownload(*web_app_info, /*data=*/nullptr);
+  std::vector<GURL> icon_urls = GetValidIconUrlsToDownload(*web_app_info);
 
   // A system app should always have a manifest icon.
   if (install_source_ == WebappInstallSource::SYSTEM_DEFAULT) {