Backed out changeset 0028834844d2 (bug 1668210) for web platform failures on delayed_window_print.html. CLOSED TREE

widget/nsPrintSettingsService.cpp

@@ -997,18 +997,7 @@ nsresult nsPrintSettingsService::SavePrintSettingsToPrefs(
   nsresult rv = GetAdjustedPrinterName(aPS, aUsePrinterNamePrefix, prtName);
   NS_ENSURE_SUCCESS(rv, rv);
 
-#ifndef MOZ_WIDGET_ANDROID
-  // On most platforms we should always use a prefix when saving print settings
-  // to prefs.  Saving without a prefix risks breaking printing for users
-  // without a good way for us to fix things for them (unprefixed prefs act as
-  // defaults and can result in values being inappropriately propagated to
-  // prefixed prefs).
-  if (prtName.IsEmpty() && aFlags != nsIPrintSettings::kInitSavePrinterName) {
-    MOZ_DIAGNOSTIC_ASSERT(false, "Print settings must be saved with a prefix");
-    return NS_ERROR_FAILURE;
-  }
-#endif
-
+  // Write the prefs, with or without a printer name prefix.
   return WritePrefs(aPS, prtName, aFlags);
 }