1 files changed, 15 insertions, 22 deletions
diff --git a/chromium/chrome/browser/resources/print_preview/settings/settings_section_select.js b/chromium/chrome/browser/resources/print_preview/settings/settings_section_select.js
index b32ce4d1535..0799c94e1c0 100644
--- a/chromium/chrome/browser/resources/print_preview/settings/settings_section_select.js
+++ b/chromium/chrome/browser/resources/print_preview/settings/settings_section_select.js
@@ -79,28 +79,7 @@ cr.define('print_preview', function() {
         select.innerHTML = '';
         this.ticketItem_.capability.option.forEach(function(option, index) {
           var selectOption = document.createElement('option');
-          var displayName = option.custom_display_name;
-          if (!displayName && option.custom_display_name_localized) {
-            var getLocaleToCompare =
-                /** @type {function(string, boolean=): string} */
-                (function(locale, opt_languageOnly) {
-              var code = opt_languageOnly ? locale.split('-')[0] : locale;
-              return code.toLowerCase();
-            });
-            var getItemForLocale = function(items, locale, languageOnly) {
-              locale = getLocaleToCompare(locale, languageOnly);
-              for (var i = 0; i < items.length; i++) {
-                if (getLocaleToCompare(items[i].locale) == locale)
-                  return items[i].value;
-              }
-              return '';
-            };
-            var items = option.custom_display_name_localized;
-            displayName =
-                getItemForLocale(items, navigator.language, false) ||
-                getItemForLocale(items, navigator.language, true);
-          }
-          selectOption.text = displayName ||
+          selectOption.text = this.getCustomDisplayName_(option) ||
                               this.getDefaultDisplayName_(option);
           selectOption.value = JSON.stringify(option);
           select.appendChild(selectOption);
@@ -121,6 +100,20 @@ cr.define('print_preview', function() {
     },
 
     /**
+     * @param {!Object} option Option to get the custom display name for.
+     * @return {string} Custom display name for the option.
+     * @private
+     */
+    getCustomDisplayName_: function(option) {
+      var displayName = option.custom_display_name;
+      if (!displayName && option.custom_display_name_localized) {
+        displayName =
+            getStringForCurrentLocale(option.custom_display_name_localized);
+      }
+      return displayName;
+    },
+
+    /**
      * @param {!Object} option Option to get the default display name for.
      * @return {string} Default option display name.
      * @private