BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 7 deletions

diff --git a/chromium/printing/print_settings_conversion.cc b/chromium/printing/print_settings_conversion.cc
index 1f90d320cf0..5fac8b41a20 100644
--- a/chromium/printing/print_settings_conversion.cc
+++ b/chromium/printing/print_settings_conversion.cc
@@ -208,6 +208,15 @@ bool PrintSettingsFromJobSettings(const base::Value& job_settings,
 #endif
   }
 
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
+  const base::Value* advanced_settings =
+      job_settings.FindDictKey(kSettingAdvancedSettings);
+  if (advanced_settings) {
+    for (const auto& item : advanced_settings->DictItems())
+      settings->advanced_settings().emplace(item.first, item.second.Clone());
+  }
+#endif  // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
+
 #if defined(OS_CHROMEOS)
   bool send_user_info =
       job_settings.FindBoolKey(kSettingSendUserInfo).value_or(false);
@@ -221,13 +230,6 @@ bool PrintSettingsFromJobSettings(const base::Value& job_settings,
   const std::string* pin_value = job_settings.FindStringKey(kSettingPinValue);
   if (pin_value)
     settings->set_pin_value(*pin_value);
-
-  const base::Value* advanced_settings =
-      job_settings.FindDictKey(kSettingAdvancedSettings);
-  if (advanced_settings) {
-    for (const auto& item : advanced_settings->DictItems())
-      settings->advanced_settings().emplace(item.first, item.second.Clone());
-  }
 #endif
 
   return true;