Rename {form,map} icons to {gform,gmap} to follow other hosted docs

The difference in naming was causing the wrong icon URL to be returned
in launcher search results, causing the icon load to fail.

Bug: 753902
Change-Id: I3d058752b08a7d12e1d7e5cc4873eebdac42b349
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935969Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Alex Danilo <adanilo@chromium.org>
Commit-Queue: Anand Mistry <amistry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719508}

chrome/browser/ui/app_list/search/common/file_icon_util.cc

@@ -152,7 +152,7 @@ int GetIconResourceIdForLocalFilePath(const base::FilePath& filepath) {
           {Icon::CHART, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_CHART},
           {Icon::EXCEL, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_EXCEL},
           {Icon::FOLDER, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FOLDER},
-          {Icon::FORM, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FORM},
+          {Icon::FORM, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GFORM},
           {Icon::GDOC, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDOC},
           {Icon::GDRAW, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDRAW},
           {Icon::GENERIC, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GENERIC},
@@ -161,7 +161,7 @@ int GetIconResourceIdForLocalFilePath(const base::FilePath& filepath) {
           {Icon::GSLIDES, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSLIDES},
           {Icon::GTABLE, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GTABLE},
           {Icon::IMAGE, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_IMAGE},
-          {Icon::MAP, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_MAP},
+          {Icon::MAP, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GMAP},
           {Icon::PDF, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PDF},
           {Icon::PPT, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PPT},
           {Icon::SCRIPT, IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_SCRIPT},

ui/file_manager/file_manager/common/js/file_type.js

@@ -333,13 +333,11 @@ FileType.types = [
     pattern: /\.gform$/i
   },
   {
-    // We use extension ".gmaps" to avoid conflict, but use singular form
-    // (gmap/map) in other parts to be consistent with other file type.
     type: 'hosted',
     icon: 'gmap',
     name: 'GMAP_DOCUMENT_FILE_TYPE',
     subtype: 'map',
-    pattern: /\.gmaps$/i
+    pattern: /\.gmap$/i
   },
   {
     type: 'hosted',

ui/file_manager/file_manager/foreground/css/file_types.css

@@ -96,13 +96,6 @@
   -webkit-mask-image: url(../images/filetype/filetype_team_drive.svg);
 }
 
-/* TODO(fukino): Check if 'form' is in use, and remove this if possible. */
-[file-type-icon='form'] {
-  background-image: -webkit-image-set(
-      url(../images/filetype/filetype_form.png) 1x,
-      url(../images/filetype/2x/filetype_form.png) 2x);
-}
-
 [file-type-icon='gdoc'] {
   background-image: -webkit-image-set(
       url(../images/filetype/filetype_gdoc.png) 1x,
@@ -141,14 +134,14 @@
 
 [file-type-icon='gform'] {
   background-image: -webkit-image-set(
-      url(../images/filetype/filetype_form.png) 1x,
-      url(../images/filetype/2x/filetype_form.png) 2x);
+      url(../images/filetype/filetype_gform.png) 1x,
+      url(../images/filetype/2x/filetype_gform.png) 2x);
 }
 
 [file-type-icon='gmap'] {
   background-image: -webkit-image-set(
-      url(../images/filetype/filetype_map.png) 1x,
-      url(../images/filetype/2x/filetype_map.png) 2x);
+      url(../images/filetype/filetype_gmap.png) 1x,
+      url(../images/filetype/2x/filetype_gmap.png) 2x);
 }
 
 [file-type-icon='gsite'] {

ui/file_manager/file_manager/foreground/elements/icons.html

@@ -51,16 +51,16 @@
       <g id="excel"><path fill="#16A765" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zM8.5 7L10 8.8 11.5 7h2L11 10l2.5 3h-2L10 11.2 8.5 13h-2L9 10 6.5 7h2z"/></g>
       <g id="folder-shared"><path d="M10 3l2 2h4c1.1 0 2 .9 2 2v8c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2l.01-10c0-1.1.89-2 1.99-2h6zm6 4H4v8h12V7zm-4 5c.998 0 3 .447 3 1.333V14H9v-.667C9 12.447 11.002 12 12 12zm0-3.5c.825 0 1.5.675 1.5 1.5s-.675 1.5-1.5 1.5-1.5-.675-1.5-1.5.675-1.5 1.5-1.5z"/></g>
       <g id="folder"><path d="M16 5h-4l-2-2H4a2 2 0 00-1.99 2L2 15c0 1.1.9 2 2 2h12a2 2 0 002-2V7a2 2 0 00-2-2zm0 10H4V7h12v8z"/></g>
-      <g id="form"><path fill="#34A853" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-1 5v2H9v-2h5zm-6 0v2H6v-2h2zm6-3v2H9V7h5zM8 7v2H6V7h2z"/></g>
       <g id="gdoc"><path fill="#4285F4" d="M15 3a2 2 0 012 2v10a2 2 0 01-2 2H5a2 2 0 01-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zm-4 5v2H7v-2h4zm2-3v2H7V7h6z"/></g>
       <g id="gdraw"><path fill="#EA4335" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-1.5 5v3.5H10V10h3.5zm-5-3.5a2 2 0 110 4 2 2 0 010-4z"/></g>
       <g id="generic"><path d="M11 2l5 5v10a1 1 0 01-1 1H5a1 1 0 01-1-1V3a1 1 0 011-1h6zm-1 2H6v12h8V8h-4V4z"/></g>
+      <g id="gform"><path fill="#34A853" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-1 5v2H9v-2h5zm-6 0v2H6v-2h2zm6-3v2H9V7h5zM8 7v2H6V7h2z"/></g>
+      <g id="gmap"><path fill="#EA4335" d="M15 3c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H5c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zm-5 1c1.657 0 3 1.328 3 2.965 0 .967-.858 2.51-2.59 4.559l-.23.27L10 14l-.18-.206C7.935 11.61 7 9.974 7 8.965 7 7.328 8.343 6 10 6zm0 2a1 1 0 100 2 1 1 0 000-2z"/></g>
       <g id="gsheet"><path fill="#34A853" d="M15 3a2 2 0 012 2v10a2 2 0 01-2 2H5a2 2 0 01-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zm-5 1v2h4v2h-4v4H8v-4H6V8h2V6h2z"/></g>
       <g id="gsite"><path fill="#796EEE" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-5 5v3H6v-3h4zm4 0v3h-3v-3h3zm0-3v2H6V7h8z"/></g>
       <g id="gslides"><path fill="#FBBC04" d="M15 3a2 2 0 012 2v10a2 2 0 01-2 2H5a2 2 0 01-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zm-1 2v6H6V7h8z"/></g>
       <g id="gtable"><path fill="#34A853" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-1 2.01v2.5l-4 4-2-2-2 2V11l2-2 2 2 4-4z"/></g>
       <g id="image"><path fill="#EA4335" d="M15 3H5a2 2 0 00-2 2v10c0 1.1.9 2 2 2h10a2 2 0 002-2V5a2 2 0 00-2-2zm0 12H5V5h10v10zm-3.67-6L9.5 12 8 10.6 6 14h8l-2.67-5z"/></g>
-      <g id="map"><path fill="#EA4335" d="M15 3c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H5c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zm-5 1c1.657 0 3 1.328 3 2.965 0 .967-.858 2.51-2.59 4.559l-.23.27L10 14l-.18-.206C7.935 11.61 7 9.974 7 8.965 7 7.328 8.343 6 10 6zm0 2a1 1 0 100 2 1 1 0 000-2z"/></g>
       <g id="pdf"><path fill="#EA4335" d="M15 3c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H5c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2zm0 2H5v10h10V5zM7.9 8a.5.5 0 0 1 .5.5v1.4a.5.5 0 0 1-.5.5H6.8V12H6V8.5a.5.5 0 0 1 .5-.5h1.4zm2.8 0a.5.5 0 0 1 .5.5v3a.5.5 0 0 1-.5.5H8.8V8.5a.5.5 0 0 1 .5-.5h1.4zM14 8v.8h-1.601v.799l.801.001v.8h-.801L12.4 12h-.8V8.4A.4.4 0 0 1 12 8h2zm-3.6.8h-.8v2.4h.8V8.8zm-2.8 0h-.8v.8h.8v-.8z"/></g>
       <g id="ppt"><path fill="#FF7537" d="M5 3h10a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5a2 2 0 011.85-2H15zm10 2H5v10h10V5zm-4 2a2 2 0 012 2v.5a2 2 0 01-2 2H8.5V13H7V7h4zm0 1.5H8.5V10H11a.5.5 0 00.5-.5V9a.5.5 0 00-.5-.5z"/></g>
       <g id="script"><path fill="#4285F4" d="M3 5a2 2 0 011.85-2H15a2 2 0 012 1.85V15a2 2 0 01-1.85 2H5a2 2 0 01-2-1.85V5zm2 10h10V5H5v4H9.7L7.76 7.13 8.9 6 13 10l-4.1 4-1.14-1.13L9.63 11H5v4z"/></g>

ui/file_manager/file_manager_resources.grd

@@ -102,16 +102,16 @@
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_CHART" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_chart.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_EXCEL" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_excel.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_FOLDER" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_folder.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_FORM" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_form.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GDOC" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gdoc.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GDRAW" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gdraw.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GENERIC" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_generic.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GFORM" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gform.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GMAP" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gmap.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GSHEET" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gsheet.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GSITE" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gsite.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GSLIDES" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gslides.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GTABLE" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gtable.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_IMAGE" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_image.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_MAP" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_map.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_PDF" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_pdf.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_PPT" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_ppt.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_SCRIPT" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_script.png" type="BINDATA" />
@@ -124,16 +124,16 @@
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_CHART" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_chart.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_EXCEL" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_excel.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FOLDER" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_folder.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FORM" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_form.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDOC" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gdoc.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDRAW" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gdraw.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GENERIC" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_generic.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GFORM" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gform.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GMAP" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gmap.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSHEET" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gsheet.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSITE" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gsite.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSLIDES" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gslides.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GTABLE" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gtable.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_IMAGE" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_image.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_MAP" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_map.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PDF" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_pdf.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PPT" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_ppt.png" type="BINDATA" />
       <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_SCRIPT" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_script.png" type="BINDATA" />