printing: Simplify some base::Value dictionary API usage.

Use Set{Bool,Int,String}Key() instead of SetKey() when possible, to
avoid having to explicitly construct base::Value objects.

Change-Id: I3ed4acc31f388c09d6692f4b6068bca78f6a49df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790526
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696608}

chrome/browser/printing/print_test_utils.cc

@@ -24,53 +24,53 @@ base::Value GetPrintTicket(PrinterType type, bool cloud) {
 
   // 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(true));
-  ticket.SetKey(kSettingPreviewIsPDF, 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));
+  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.SetBoolKey(kSettingPrintToPDF, !cloud && type == kPdfPrinter);
+  ticket.SetBoolKey(kSettingCloudPrintDialog, cloud);
+  ticket.SetBoolKey(kSettingPrintWithPrivet, is_privet_printer);
+  ticket.SetBoolKey(kSettingPrintWithExtension, is_extension_printer);
+  ticket.SetBoolKey(kSettingRasterizePdf, false);
+  ticket.SetIntKey(kSettingScaleFactor, 100);
+  ticket.SetIntKey(kSettingPagesPerSheet, 1);
+  ticket.SetIntKey(kSettingDpiHorizontal, kTestPrinterDpi);
+  ticket.SetIntKey(kSettingDpiVertical, kTestPrinterDpi);
+  ticket.SetStringKey(kSettingDeviceName, kDummyPrinterName);
+  ticket.SetBoolKey(kSettingFitToPageEnabled, true);
+  ticket.SetIntKey(kSettingPageWidth, 215900);
+  ticket.SetIntKey(kSettingPageHeight, 279400);
+  ticket.SetBoolKey(kSettingShowSystemDialog, false);
 
   if (cloud)
-    ticket.SetKey(kSettingCloudPrintId, base::Value(kDummyPrinterName));
+    ticket.SetStringKey(kSettingCloudPrintId, kDummyPrinterName);
 
   if (is_privet_printer || is_extension_printer) {
     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;

chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc

@@ -95,10 +95,10 @@ base::Value GetPrintPreviewTicket() {
 
   // Make some modifications to match a preview print ticket.
   print_ticket.SetKey(kSettingPageRange, base::Value());
-  print_ticket.SetKey(kIsFirstRequest, base::Value(true));
-  print_ticket.SetKey(kPreviewRequestID, base::Value(0));
-  print_ticket.SetKey(kSettingPreviewModifiable, base::Value(false));
-  print_ticket.SetKey(kSettingPreviewIsPDF, base::Value(true));
+  print_ticket.SetBoolKey(kIsFirstRequest, true);
+  print_ticket.SetIntKey(kPreviewRequestID, 0);
+  print_ticket.SetBoolKey(kSettingPreviewModifiable, false);
+  print_ticket.SetBoolKey(kSettingPreviewIsPDF, true);
   print_ticket.RemoveKey(kSettingPageWidth);
   print_ticket.RemoveKey(kSettingPageHeight);
   print_ticket.RemoveKey(kSettingShowSystemDialog);