Cleanup various bits of printing code.

Review URL: https://codereview.chromium.org/27146002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228518 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 47 insertions, 52 deletions

diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index 748625d..eb49ca4 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -16,6 +16,8 @@
 #include "printing/backend/print_backend_consts.h"
 #include "url/gurl.h"
 
+namespace printing {
+
 // This section contains helper code for PPD parsing for semantic capabilities.
 namespace {
 
@@ -113,8 +115,8 @@ void MarkLpOptions(const std::string& printer_name, ppd_file_t** ppd) {
 #endif  // !defined(OS_MACOSX)
 
 bool GetBasicColorModelSettings(ppd_file_t* ppd,
-                                int* color_model_for_black,
-                                int* color_model_for_color,
+                                ColorModel* color_model_for_black,
+                                ColorModel* color_model_for_color,
                                 bool* color_is_default) {
   ppd_option_t* color_model = ppdFindOption(ppd, kColorModel);
   if (!color_model)
@@ -158,8 +160,8 @@ bool GetBasicColorModelSettings(ppd_file_t* ppd,
 }
 
 bool GetPrintOutModeColorSettings(ppd_file_t* ppd,
-                                  int* color_model_for_black,
-                                  int* color_model_for_color,
+                                  ColorModel* color_model_for_black,
+                                  ColorModel* color_model_for_color,
                                   bool* color_is_default) {
   ppd_option_t* printout_mode = ppdFindOption(ppd, kPrintoutMode);
   if (!printout_mode)
@@ -195,8 +197,8 @@ bool GetPrintOutModeColorSettings(ppd_file_t* ppd,
 }
 
 bool GetColorModeSettings(ppd_file_t* ppd,
-                          int* color_model_for_black,
-                          int* color_model_for_color,
+                          ColorModel* color_model_for_black,
+                          ColorModel* color_model_for_color,
                           bool* color_is_default) {
   // Samsung printers use "ColorMode" attribute in their ppds.
   ppd_option_t* color_mode_option = ppdFindOption(ppd, kColorMode);
@@ -223,8 +225,8 @@ bool GetColorModeSettings(ppd_file_t* ppd,
 }
 
 bool GetHPColorSettings(ppd_file_t* ppd,
-                        int* color_model_for_black,
-                        int* color_model_for_color,
+                        ColorModel* color_model_for_black,
+                        ColorModel* color_model_for_color,
                         bool* color_is_default) {
   // HP printers use "Color/Color Model" attribute in their ppds.
   ppd_option_t* color_mode_option = ppdFindOption(ppd, printing::kColor);
@@ -249,8 +251,8 @@ bool GetHPColorSettings(ppd_file_t* ppd,
 }
 
 bool GetProcessColorModelSettings(ppd_file_t* ppd,
-                                  int* color_model_for_black,
-                                  int* color_model_for_color,
+                                  ColorModel* color_model_for_black,
+                                  ColorModel* color_model_for_color,
                                   bool* color_is_default) {
   // Canon printers use "ProcessColorModel" attribute in their ppds.
   ppd_option_t* color_mode_option =  ppdFindOption(ppd, kProcessColorModel);
@@ -279,8 +281,8 @@ bool GetProcessColorModelSettings(ppd_file_t* ppd,
 }
 
 bool GetColorModelSettings(ppd_file_t* ppd,
-                           int* cm_black,
-                           int* cm_color,
+                           ColorModel* cm_black,
+                           ColorModel* cm_color,
                            bool* is_color) {
   bool is_color_device = false;
   ppd_attr_t* attr = ppdFindAttr(ppd, kColorDevice, NULL);
@@ -296,12 +298,10 @@ bool GetColorModelSettings(ppd_file_t* ppd,
       GetProcessColorModelSettings(ppd, cm_black, cm_color, is_color);
 }
 
-}  // namespace
-
-namespace printing {
-
 // Default port for IPP print servers.
-static const int kDefaultIPPServerPort = 631;
+const int kDefaultIPPServerPort = 631;
+
+}  // namespace
 
 // Helper wrapper around http_t structure, with connection and cleanup
 // functionality.
@@ -316,11 +316,10 @@ HttpConnectionCUPS::HttpConnectionCUPS(const GURL& print_server_url,
   if (port == url_parse::PORT_UNSPECIFIED)
     port = kDefaultIPPServerPort;
 
-  http_ = httpConnectEncrypt(print_server_url.host().c_str(), port,
-                             encryption);
+  http_ = httpConnectEncrypt(print_server_url.host().c_str(), port, encryption);
   if (http_ == NULL) {
-    LOG(ERROR) << "CP_CUPS: Failed connecting to print server: " <<
-               print_server_url;
+    LOG(ERROR) << "CP_CUPS: Failed connecting to print server: "
+               << print_server_url;
   }
 }
 
@@ -337,7 +336,7 @@ http_t* HttpConnectionCUPS::http() {
   return http_;
 }
 
-bool parsePpdCapabilities(
+bool ParsePpdCapabilities(
     const std::string& printer_name,
     const std::string& printer_capabilities,
     PrinterSemanticCapsAndDefaults* printer_info) {
@@ -378,12 +377,14 @@ bool parsePpdCapabilities(
   }
 
   bool is_color = false;
-  int cm_color = 0, cm_black = 0;
+  ColorModel cm_color = UNKNOWN_COLOR_MODEL, cm_black = UNKNOWN_COLOR_MODEL;
   if (!GetColorModelSettings(ppd, &cm_black, &cm_color, &is_color)) {
     VLOG(1) << "Unknown printer color model";
   }
 
-  caps.color_changeable = (cm_color && cm_black && (cm_color != cm_black));
+  caps.color_changeable = ((cm_color != UNKNOWN_COLOR_MODEL) &&
+                           (cm_black != UNKNOWN_COLOR_MODEL) &&
+                           (cm_color != cm_black));
   caps.color_default = is_color;
 
   ppdClose(ppd);
diff --git a/printing/backend/cups_helper.h b/printing/backend/cups_helper.h
index 04ff08a..873f1ec 100644
--- a/printing/backend/cups_helper.h
+++ b/printing/backend/cups_helper.h
@@ -36,7 +36,7 @@ class PRINTING_EXPORT HttpConnectionCUPS {
 
 // Helper function to parse and convert PPD capabilitites to
 // semantic options.
-PRINTING_EXPORT bool parsePpdCapabilities(
+PRINTING_EXPORT bool ParsePpdCapabilities(
     const std::string& printer_name,
     const std::string& printer_capabilities,
     PrinterSemanticCapsAndDefaults* printer_info);
diff --git a/printing/backend/cups_helper_unittest.cc b/printing/backend/cups_helper_unittest.cc
index 7a111e3..7f2b77c 100644
--- a/printing/backend/cups_helper_unittest.cc
+++ b/printing/backend/cups_helper_unittest.cc
@@ -32,7 +32,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexLongEdge) {
       "*CloseGroup: General\n");
 
   printing::PrinterSemanticCapsAndDefaults caps;
-  EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
+  EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
   EXPECT_FALSE(caps.color_changeable);
   EXPECT_FALSE(caps.color_default);
   EXPECT_TRUE(caps.duplex_capable);
@@ -57,7 +57,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexSimples) {
       "*CloseGroup: General\n");
 
   printing::PrinterSemanticCapsAndDefaults caps;
-  EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
+  EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
   EXPECT_FALSE(caps.color_changeable);
   EXPECT_FALSE(caps.color_default);
   EXPECT_TRUE(caps.duplex_capable);
@@ -81,7 +81,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorNoDuplex) {
       "*CloseGroup: General\n");
 
   printing::PrinterSemanticCapsAndDefaults caps;
-  EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
+  EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
   EXPECT_FALSE(caps.color_changeable);
   EXPECT_FALSE(caps.color_default);
   EXPECT_FALSE(caps.duplex_capable);
@@ -114,7 +114,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorTrueDuplexLongEdge) {
       "*CloseGroup: General\n");
 
   printing::PrinterSemanticCapsAndDefaults caps;
-  EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
+  EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
   EXPECT_TRUE(caps.color_changeable);
   EXPECT_TRUE(caps.color_default);
   EXPECT_TRUE(caps.duplex_capable);
@@ -151,7 +151,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorFalseDuplexLongEdge) {
       "*CloseGroup: General\n");
 
   printing::PrinterSemanticCapsAndDefaults caps;
-  EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
+  EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
   EXPECT_TRUE(caps.color_changeable);
   EXPECT_FALSE(caps.color_default);
   EXPECT_TRUE(caps.duplex_capable);
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 2eb2143..bf7141e 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -10,9 +10,7 @@
 #include <errno.h>
 #include <pthread.h>
 
-#if defined(OS_MACOSX)
-#include <AvailabilityMacros.h>
-#else
+#if !defined(OS_MACOSX)
 #include <gcrypt.h>
 #endif
 
@@ -27,10 +25,6 @@
 #include "printing/backend/print_backend_consts.h"
 #include "url/gurl.h"
 
-#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
-const int CUPS_PRINTER_SCANNER = 0x2000000;  // Scanner-only device
-#endif
-
 #if !defined(OS_MACOSX)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
@@ -163,7 +157,7 @@ bool PrintBackendCUPS::EnumeratePrinters(PrinterList* printer_list) {
     return false;
   }
 
-  for (int printer_index = 0; printer_index < num_dests; printer_index++) {
+  for (int printer_index = 0; printer_index < num_dests; ++printer_index) {
     const cups_dest_t& printer = destinations[printer_index];
 
     // CUPS can have 'printers' that are actually scanners. (not MFC)
@@ -197,7 +191,7 @@ bool PrintBackendCUPS::EnumeratePrinters(PrinterList* printer_list) {
       printer_info.options[kDriverInfoTagName] = *drv_info;
 
     // Store printer options.
-    for (int opt_index = 0; opt_index < printer.num_options; opt_index++) {
+    for (int opt_index = 0; opt_index < printer.num_options; ++opt_index) {
       printer_info.options[printer.options[opt_index].name] =
           printer.options[opt_index].value;
     }
@@ -230,7 +224,7 @@ bool PrintBackendCUPS::GetPrinterSemanticCapsAndDefaults(
   if (!GetPrinterCapsAndDefaults(printer_name, &info) )
     return false;
 
-  return parsePpdCapabilities(
+  return ParsePpdCapabilities(
       printer_name, info.printer_capabilities, printer_info);
 }
 
@@ -271,7 +265,7 @@ std::string PrintBackendCUPS::GetPrinterDriverInfo(
   cups_dest_t* destinations = NULL;
   int num_dests = GetDests(&destinations);
   std::string result;
-  for (int printer_index = 0; printer_index < num_dests; printer_index++) {
+  for (int printer_index = 0; printer_index < num_dests; ++printer_index) {
     const cups_dest_t& printer = destinations[printer_index];
     if (printer_name == printer.name) {
       const char* info = cupsGetOption(kCUPSPrinterMakeModelOpt,
@@ -301,7 +295,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::string& printer_name) {
 }
 
 scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
-    const DictionaryValue* print_backend_settings) {
+    const base::DictionaryValue* print_backend_settings) {
 #if !defined(OS_MACOSX)
   // Initialize gcrypt library.
   g_gcrypt_initializer.Get();
diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h
index b5b3130..c038eb0 100644
--- a/printing/print_job_constants.h
+++ b/printing/print_job_constants.h
@@ -99,7 +99,7 @@ enum VerticalHeaderFooterPosition {
 };
 
 // Print job color mode values.
-enum ColorModels {
+enum ColorModel {
   UNKNOWN_COLOR_MODEL,
   GRAY,
   COLOR,
diff --git a/printing/print_settings.cc b/printing/print_settings.cc
index 7214642..f024d2a 100644
--- a/printing/print_settings.cc
+++ b/printing/print_settings.cc
@@ -98,13 +98,13 @@ void GetColorModelForMode(
 }
 #endif  // defined(USE_CUPS)
 
-bool isColorModelSelected(int model) {
-  return (model != GRAY &&
-          model != BLACK &&
-          model != PRINTOUTMODE_NORMAL_GRAY &&
-          model != COLORMODE_MONOCHROME &&
-          model != PROCESSCOLORMODEL_GREYSCALE &&
-          model != HP_COLOR_BLACK);
+bool IsColorModelSelected(int color_mode) {
+  return (color_mode != GRAY &&
+          color_mode != BLACK &&
+          color_mode != PRINTOUTMODE_NORMAL_GRAY &&
+          color_mode != COLORMODE_MONOCHROME &&
+          color_mode != PROCESSCOLORMODEL_GREYSCALE &&
+          color_mode != HP_COLOR_BLACK);
 }
 
 // Global SequenceNumber used for generating unique cookie values.
diff --git a/printing/print_settings.h b/printing/print_settings.h
index 38c5a76..f177699 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -16,8 +16,8 @@
 
 namespace printing {
 
-// Returns true if color model is selected.
-PRINTING_EXPORT bool isColorModelSelected(int model);
+// Returns true if |color_mode| is color and not B&W.
+PRINTING_EXPORT bool IsColorModelSelected(int color_mode);
 
 #if defined(USE_CUPS)
 // Get the color model setting name and value for the |color_mode|.