[iOS] Move infobar close image

Move infobar_close into downloads/, which is the only place where it's
used, and rename it.

Bug: 884722
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I539058203790b7ba7b0e28e94e989ce32e0e95fd
Reviewed-on: https://chromium-review.googlesource.com/1248704
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594708}

ios/chrome/browser/ui/download/BUILD.gn

@@ -26,6 +26,7 @@ source_set("download") {
     "resources:background_compact",
     "resources:background_regular",
     "resources:done_badge",
+    "resources:download_close",
     "resources:error_badge",
     "//base",
     "//components/infobars/core",

ios/chrome/browser/ui/download/download_manager_view_controller.mm

@@ -419,8 +419,7 @@ NSString* GetSizeString(long long size_in_bytes) {
     _closeButton.exclusiveTouch = YES;
     _closeButton.accessibilityLabel = l10n_util::GetNSString(IDS_CLOSE);
 
-    // TODO(crbug.com/228611): Add IDR_ constant and use GetNativeImageNamed().
-    UIImage* image = [UIImage imageNamed:@"infobar_close"];
+    UIImage* image = [UIImage imageNamed:@"download_close"];
     [_closeButton setImage:image forState:UIControlStateNormal];
 
     [_closeButton addTarget:self

ios/chrome/browser/ui/download/resources/BUILD.gn

@@ -30,7 +30,14 @@ imageset("done_badge") {
     "done_badge.imageset/done_badge@3x.png",
   ]
 }
-
+imageset("download_close") {
+  sources = [
+    "download_close.imageset/Contents.json",
+    "download_close.imageset/download_close.png",
+    "download_close.imageset/download_close@2x.png",
+    "download_close.imageset/download_close@3x.png",
+  ]
+}
 imageset("error_badge") {
   sources = [
     "error_badge.imageset/Contents.json",

ios/chrome/browser/ui/infobars/resources/infobar_close.imageset/Contents.json → ios/chrome/browser/ui/download/resources/download_close.imageset/Contents.json

@@ -3,17 +3,17 @@
         {
             "idiom": "universal",
             "scale": "1x",
-            "filename": "infobar_close.png"
+            "filename": "download_close.png"
         },
         {
             "idiom": "universal",
             "scale": "2x",
-            "filename": "infobar_close@2x.png"
+            "filename": "download_close@2x.png"
         },
         {
             "idiom": "universal",
             "scale": "3x",
-            "filename": "infobar_close@3x.png"
+            "filename": "download_close@3x.png"
         }
     ],
     "info": {

ios/chrome/browser/ui/infobars/BUILD.gn

@@ -13,7 +13,6 @@ source_set("infobars") {
     "infobar_view_sizing_delegate.h",
   ]
   deps = [
-    "resources:infobar_close",
     "resources:infobar_downloading",
     "resources:infobar_popup_blocker",
     "resources:infobar_warning",

ios/chrome/browser/ui/infobars/resources/BUILD.gn

@@ -22,15 +22,6 @@ imageset("infobar_downloading") {
   ]
 }
 
-imageset("infobar_close") {
-  sources = [
-    "infobar_close.imageset/Contents.json",
-    "infobar_close.imageset/infobar_close.png",
-    "infobar_close.imageset/infobar_close@2x.png",
-    "infobar_close.imageset/infobar_close@3x.png",
-  ]
-}
-
 imageset("infobar_popup_blocker") {
   sources = [
     "infobar_popup_blocker.imageset/Contents.json",