Convert local printer capabilites to CDD format to unify with cloud printers and PDF printer. This …

printing/backend/cups_helper_unittest.cc

Index: printing/backend/cups_helper_unittest.cc
diff --git a/printing/backend/cups_helper_unittest.cc b/printing/backend/cups_helper_unittest.cc
index 7f2b77cbe4e672735aada6d943ab5c544f1a7728..83dc0a1135e2654c932dc2a6db44dfc24247d0eb 100644
--- a/printing/backend/cups_helper_unittest.cc
+++ b/printing/backend/cups_helper_unittest.cc
@@ -33,10 +33,13 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexLongEdge) {
 
   printing::PrinterSemanticCapsAndDefaults caps;
   EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
-  EXPECT_FALSE(caps.color_changeable);
-  EXPECT_FALSE(caps.color_default);
+  EXPECT_TRUE(caps.collate_capable);
+  EXPECT_TRUE(caps.collate_default);
+  EXPECT_TRUE(caps.copies_capable);
   EXPECT_TRUE(caps.duplex_capable);
   EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
+  EXPECT_FALSE(caps.color_changeable);
+  EXPECT_FALSE(caps.color_default);
 }
 
 // Test duplex detection code, which regressed in http://crbug.com/103999.
@@ -58,10 +61,13 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexSimples) {
 
   printing::PrinterSemanticCapsAndDefaults caps;
   EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
-  EXPECT_FALSE(caps.color_changeable);
-  EXPECT_FALSE(caps.color_default);
+  EXPECT_TRUE(caps.collate_capable);
+  EXPECT_TRUE(caps.collate_default);
+  EXPECT_TRUE(caps.copies_capable);
   EXPECT_TRUE(caps.duplex_capable);
   EXPECT_EQ(caps.duplex_default, printing::SIMPLEX);
+  EXPECT_FALSE(caps.color_changeable);
+  EXPECT_FALSE(caps.color_default);
 }
 
 TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorNoDuplex) {
@@ -82,10 +88,13 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorNoDuplex) {
 
   printing::PrinterSemanticCapsAndDefaults caps;
   EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
-  EXPECT_FALSE(caps.color_changeable);
-  EXPECT_FALSE(caps.color_default);
+  EXPECT_TRUE(caps.collate_capable);
+  EXPECT_TRUE(caps.collate_default);
+  EXPECT_TRUE(caps.copies_capable);
   EXPECT_FALSE(caps.duplex_capable);
   EXPECT_EQ(caps.duplex_default, printing::UNKNOWN_DUPLEX_MODE);
+  EXPECT_FALSE(caps.color_changeable);
+  EXPECT_FALSE(caps.color_default);
 }
 
 TEST(PrintBackendCupsHelperTest, TestPpdParsingColorTrueDuplexLongEdge) {
@@ -115,10 +124,13 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorTrueDuplexLongEdge) {
 
   printing::PrinterSemanticCapsAndDefaults caps;
   EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
-  EXPECT_TRUE(caps.color_changeable);
-  EXPECT_TRUE(caps.color_default);
+  EXPECT_TRUE(caps.collate_capable);
+  EXPECT_TRUE(caps.collate_default);
+  EXPECT_TRUE(caps.copies_capable);
   EXPECT_TRUE(caps.duplex_capable);
   EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
+  EXPECT_TRUE(caps.color_changeable);
+  EXPECT_TRUE(caps.color_default);
 }
 
 TEST(PrintBackendCupsHelperTest, TestPpdParsingColorFalseDuplexLongEdge) {
@@ -152,8 +164,11 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorFalseDuplexLongEdge) {
 
   printing::PrinterSemanticCapsAndDefaults caps;
   EXPECT_TRUE(printing::ParsePpdCapabilities("test", test_ppd_data, &caps));
-  EXPECT_TRUE(caps.color_changeable);
-  EXPECT_FALSE(caps.color_default);
+  EXPECT_TRUE(caps.collate_capable);
+  EXPECT_TRUE(caps.collate_default);
+  EXPECT_TRUE(caps.copies_capable);
   EXPECT_TRUE(caps.duplex_capable);
   EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
+  EXPECT_TRUE(caps.color_changeable);
+  EXPECT_FALSE(caps.color_default);
 }