summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/printing/print_test_utils.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/printing/print_test_utils.cc')
-rw-r--r--chromium/chrome/browser/printing/print_test_utils.cc74
1 files changed, 34 insertions, 40 deletions
diff --git a/chromium/chrome/browser/printing/print_test_utils.cc b/chromium/chrome/browser/printing/print_test_utils.cc
index dca5eafb812..ab3585c1be4 100644
--- a/chromium/chrome/browser/printing/print_test_utils.cc
+++ b/chromium/chrome/browser/printing/print_test_utils.cc
@@ -16,60 +16,54 @@ namespace printing {
const char kDummyPrinterName[] = "DefaultPrinter";
-base::Value GetPrintTicket(PrinterType type, bool cloud) {
- bool is_privet_printer = !cloud && type == kPrivetPrinter;
- bool is_extension_printer = !cloud && type == kExtensionPrinter;
-
+base::Value GetPrintTicket(PrinterType type) {
base::Value ticket(base::Value::Type::DICTIONARY);
// Letter
base::Value media_size(base::Value::Type::DICTIONARY);
- media_size.SetKey(kSettingMediaSizeIsDefault, base::Value(true));
- media_size.SetKey(kSettingMediaSizeWidthMicrons, base::Value(215900));
- media_size.SetKey(kSettingMediaSizeHeightMicrons, base::Value(279400));
+ media_size.SetBoolKey(kSettingMediaSizeIsDefault, true);
+ media_size.SetIntKey(kSettingMediaSizeWidthMicrons, 215900);
+ media_size.SetIntKey(kSettingMediaSizeHeightMicrons, 279400);
ticket.SetKey(kSettingMediaSize, std::move(media_size));
- ticket.SetKey(kSettingPreviewPageCount, base::Value(1));
- ticket.SetKey(kSettingLandscape, base::Value(false));
- ticket.SetKey(kSettingColor, base::Value(2)); // color printing
- ticket.SetKey(kSettingHeaderFooterEnabled, base::Value(false));
- ticket.SetKey(kSettingMarginsType, base::Value(0)); // default margins
- ticket.SetKey(kSettingDuplexMode, base::Value(LONG_EDGE));
- ticket.SetKey(kSettingCopies, base::Value(1));
- ticket.SetKey(kSettingCollate, base::Value(true));
- ticket.SetKey(kSettingShouldPrintBackgrounds, base::Value(false));
- ticket.SetKey(kSettingShouldPrintSelectionOnly, base::Value(false));
- ticket.SetKey(kSettingPreviewModifiable, base::Value(false));
- ticket.SetKey(kSettingPrintToPDF, base::Value(!cloud && type == kPdfPrinter));
- ticket.SetKey(kSettingCloudPrintDialog, base::Value(cloud));
- ticket.SetKey(kSettingPrintWithPrivet, base::Value(is_privet_printer));
- ticket.SetKey(kSettingPrintWithExtension, base::Value(is_extension_printer));
- ticket.SetKey(kSettingRasterizePdf, base::Value(false));
- ticket.SetKey(kSettingScaleFactor, base::Value(100));
- ticket.SetKey(kSettingPagesPerSheet, base::Value(1));
- ticket.SetKey(kSettingDpiHorizontal, base::Value(kTestPrinterDpi));
- ticket.SetKey(kSettingDpiVertical, base::Value(kTestPrinterDpi));
- ticket.SetKey(kSettingDeviceName, base::Value(kDummyPrinterName));
- ticket.SetKey(kSettingFitToPageEnabled, base::Value(true));
- ticket.SetKey(kSettingPageWidth, base::Value(215900));
- ticket.SetKey(kSettingPageHeight, base::Value(279400));
- ticket.SetKey(kSettingShowSystemDialog, base::Value(false));
-
- if (cloud)
- ticket.SetKey(kSettingCloudPrintId, base::Value(kDummyPrinterName));
+ ticket.SetIntKey(kSettingPreviewPageCount, 1);
+ ticket.SetBoolKey(kSettingLandscape, false);
+ ticket.SetIntKey(kSettingColor, 2); // color printing
+ ticket.SetBoolKey(kSettingHeaderFooterEnabled, false);
+ ticket.SetIntKey(kSettingMarginsType, 0); // default margins
+ ticket.SetIntKey(kSettingDuplexMode, LONG_EDGE);
+ ticket.SetIntKey(kSettingCopies, 1);
+ ticket.SetBoolKey(kSettingCollate, true);
+ ticket.SetBoolKey(kSettingShouldPrintBackgrounds, false);
+ ticket.SetBoolKey(kSettingShouldPrintSelectionOnly, false);
+ ticket.SetBoolKey(kSettingPreviewModifiable, true);
+ ticket.SetBoolKey(kSettingPreviewIsPdf, false);
+ ticket.SetIntKey(kSettingPrinterType, type);
+ ticket.SetBoolKey(kSettingRasterizePdf, false);
+ ticket.SetIntKey(kSettingScaleFactor, 100);
+ ticket.SetIntKey(kSettingScalingType, FIT_TO_PAGE);
+ ticket.SetIntKey(kSettingPagesPerSheet, 1);
+ ticket.SetIntKey(kSettingDpiHorizontal, kTestPrinterDpi);
+ ticket.SetIntKey(kSettingDpiVertical, kTestPrinterDpi);
+ ticket.SetStringKey(kSettingDeviceName, kDummyPrinterName);
+ ticket.SetIntKey(kSettingPageWidth, 215900);
+ ticket.SetIntKey(kSettingPageHeight, 279400);
+ ticket.SetBoolKey(kSettingShowSystemDialog, false);
- if (is_privet_printer || is_extension_printer) {
+ if (type == kCloudPrinter) {
+ ticket.SetStringKey(kSettingCloudPrintId, kDummyPrinterName);
+ } else if (type == kPrivetPrinter || type == kExtensionPrinter) {
base::Value capabilities(base::Value::Type::DICTIONARY);
- capabilities.SetKey("duplex", base::Value(true)); // non-empty
+ capabilities.SetBoolKey("duplex", true); // non-empty
std::string caps_string;
base::JSONWriter::Write(capabilities, &caps_string);
- ticket.SetKey(kSettingCapabilities, base::Value(caps_string));
+ ticket.SetStringKey(kSettingCapabilities, caps_string);
base::Value print_ticket(base::Value::Type::DICTIONARY);
- print_ticket.SetKey("version", base::Value("1.0"));
+ print_ticket.SetStringKey("version", "1.0");
print_ticket.SetKey("print", base::Value());
std::string ticket_string;
base::JSONWriter::Write(print_ticket, &ticket_string);
- ticket.SetKey(kSettingTicket, base::Value(ticket_string));
+ ticket.SetStringKey(kSettingTicket, ticket_string);
}
return ticket;