Define icons in proper location

Bug: 845472
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ie46d8b73d9cc16f8156d0c07e82811bab46bd933
Reviewed-on: https://chromium-review.googlesource.com/1070974
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561448}

ios/showcase/manual_fill/BUILD.gn

@@ -18,13 +18,13 @@ source_set("manual_fill") {
     "password_picker_view_controller.mm",
   ]
   deps = [
-    ":ic_credit_card",
-    ":ic_keyboard_arrow_up",
-    ":ic_vpn_key",
     "//base",
     "//ios/showcase/common",
     "//third_party/material_design_icons:ic_account_circle",
+    "//third_party/material_design_icons:ic_credit_card",
     "//third_party/material_design_icons:ic_keyboard_arrow_down",
+    "//third_party/material_design_icons:ic_keyboard_arrow_up",
+    "//third_party/material_design_icons:ic_vpn_key",
   ]
   libs = [
     "UIKit.framework",
@@ -32,29 +32,3 @@ source_set("manual_fill") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
-
-import("//build/config/ios/asset_catalog.gni")
-
-# List of all the icons used in the demo that are not already used in Chromium.
-_image_sets = [
-  "action/ic_credit_card",
-  "communication/ic_vpn_key",
-  "hardware/ic_keyboard_arrow_up",
-]
-
-# Define all the imagesets using the description from _image_sets variable.
-# All imagesets are assumed to be universal and to include @1x, @2x and @3x
-# version of the images.
-foreach(_image_set, _image_sets) {
-  _category = get_path_info(_image_set, "dir")
-  _image_name = get_path_info(_image_set, "file")
-  imageset(_image_name) {
-    _imageset_dir = "//third_party/material_design_icons/src/$_category/ios/$_image_name.imageset"
-    sources = [
-      "$_imageset_dir/${_image_name}.png",
-      "$_imageset_dir/${_image_name}_2x.png",
-      "$_imageset_dir/${_image_name}_3x.png",
-      "$_imageset_dir/Contents.json",
-    ]
-  }
-}

third_party/material_design_icons/BUILD.gn

@@ -13,6 +13,7 @@ import("//build/config/ios/asset_catalog.gni")
 _image_sets = [
   "action/ic_account_circle",
   "action/ic_account_circle_48pt",
+  "action/ic_credit_card",
   "action/ic_delete",
   "action/ic_done",
   "action/ic_feedback",
@@ -28,6 +29,7 @@ _image_sets = [
   "communication/ic_comment",
   "communication/ic_email",
   "communication/ic_message",
+  "communication/ic_vpn_key",
   "content/ic_link",
   "content/ic_send",
   "content/ic_undo",
@@ -37,6 +39,7 @@ _image_sets = [
   "hardware/ic_desktop_windows_white",
   "hardware/ic_keyboard_arrow_down",
   "hardware/ic_keyboard_arrow_right",
+  "hardware/ic_keyboard_arrow_up",
   "hardware/ic_mouse",
   "image/ic_photo_camera",
   "image/ic_photo_library",