Make Papers an alias for std::vector<Paper>.

Because writing out
std::vector<printing::PrinterSemanticCapsAndDefaults::Paper> takes up
the entire line. Also initialize more class members in print_backend.h.

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

printing/backend/cups_ipp_util.cc

@@ -282,14 +282,14 @@ PrinterSemanticCapsAndDefaults::Paper DefaultPaper(
   return ParsePaper(ippGetString(attr, 0, nullptr));
 }
 
-std::vector<PrinterSemanticCapsAndDefaults::Paper> SupportedPapers(
+PrinterSemanticCapsAndDefaults::Papers SupportedPapers(
     const CupsOptionProvider& printer) {
   std::vector<base::StringPiece> papers =
       printer.GetSupportedOptionValueStrings(kIppMedia);
-  std::vector<PrinterSemanticCapsAndDefaults::Paper> parsed_papers;
-  for (base::StringPiece paper : papers) {
+  PrinterSemanticCapsAndDefaults::Papers parsed_papers;
+  parsed_papers.reserve(papers.size());
+  for (base::StringPiece paper : papers)
     parsed_papers.push_back(ParsePaper(paper));
-  }
 
   return parsed_papers;
 }

printing/backend/cups_ipp_util.h

@@ -7,6 +7,7 @@
 #ifndef PRINTING_BACKEND_CUPS_IPP_UTIL_H_
 #define PRINTING_BACKEND_CUPS_IPP_UTIL_H_
 
+#include <memory>
 #include <vector>
 
 #include "printing/backend/cups_printer.h"
@@ -38,7 +39,7 @@ PrinterSemanticCapsAndDefaults::Paper DefaultPaper(
     const CupsOptionProvider& printer);
 
 // Returns the list of papers supported by the |printer|.
-std::vector<PrinterSemanticCapsAndDefaults::Paper> SupportedPapers(
+PrinterSemanticCapsAndDefaults::Papers SupportedPapers(
     const CupsOptionProvider& printer);
 
 // Retrieves the supported number of copies from |printer| and writes the

printing/backend/print_backend.cc

@@ -13,24 +13,13 @@ printing::PrintBackend* g_print_backend_for_test = nullptr;
 
 namespace printing {
 
-PrinterBasicInfo::PrinterBasicInfo()
-    : printer_status(0),
-      is_default(false) {}
+PrinterBasicInfo::PrinterBasicInfo() = default;
 
 PrinterBasicInfo::PrinterBasicInfo(const PrinterBasicInfo& other) = default;
 
 PrinterBasicInfo::~PrinterBasicInfo() = default;
 
-PrinterSemanticCapsAndDefaults::PrinterSemanticCapsAndDefaults()
-    : collate_capable(false),
-      collate_default(false),
-      copies_capable(false),
-      duplex_default(UNKNOWN_DUPLEX_MODE),
-      color_changeable(false),
-      color_default(false),
-      color_model(UNKNOWN_COLOR_MODEL),
-      bw_model(UNKNOWN_COLOR_MODEL)
-{}
+PrinterSemanticCapsAndDefaults::PrinterSemanticCapsAndDefaults() = default;
 
 PrinterSemanticCapsAndDefaults::PrinterSemanticCapsAndDefaults(
     const PrinterSemanticCapsAndDefaults& other) = default;

printing/backend/print_backend.h

@@ -31,8 +31,8 @@ struct PRINTING_EXPORT PrinterBasicInfo {
 
   std::string printer_name;
   std::string printer_description;
-  int printer_status;
-  int is_default;
+  int printer_status = 0;
+  int is_default = false;
   std::map<std::string, std::string> options;
 };
 
@@ -43,25 +43,26 @@ struct PRINTING_EXPORT PrinterSemanticCapsAndDefaults {
   PrinterSemanticCapsAndDefaults(const PrinterSemanticCapsAndDefaults& other);
   ~PrinterSemanticCapsAndDefaults();
 
-  bool collate_capable;
-  bool collate_default;
+  bool collate_capable = false;
+  bool collate_default = false;
 
-  bool copies_capable;
+  bool copies_capable = false;
 
   std::vector<DuplexMode> duplex_modes;
-  DuplexMode duplex_default;
+  DuplexMode duplex_default = UNKNOWN_DUPLEX_MODE;
 
-  bool color_changeable;
-  bool color_default;
-  ColorModel color_model;
-  ColorModel bw_model;
+  bool color_changeable = false;
+  bool color_default = false;
+  ColorModel color_model = UNKNOWN_COLOR_MODEL;
+  ColorModel bw_model = UNKNOWN_COLOR_MODEL;
 
   struct Paper {
     std::string display_name;
     std::string vendor_id;
     gfx::Size size_um;
   };
-  std::vector<Paper> papers;
+  using Papers = std::vector<Paper>;
+  Papers papers;
   Paper default_paper;
 
   std::vector<gfx::Size> dpis;