Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes…

chrome/common/cloud_print/cloud_print_cdd_conversion.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/cloud_print/cloud_print_cdd_conversion.h"
 
+#include "base/strings/string_number_conversions.h"
 #include "components/cloud_devices/common/printer_description.h"
 #include "printing/backend/print_backend.h"
 
 namespace cloud_print {
 
 scoped_ptr<base::DictionaryValue> PrinterSemanticCapsAndDefaultsToCdd(
     const printing::PrinterSemanticCapsAndDefaults& semantic_info) {
   using namespace cloud_devices::printer;
   cloud_devices::CloudDeviceDescription description;
 
@@ skipping 18 matching lines @@
         NO_DUPLEX, semantic_info.duplex_default == printing::SIMPLEX);
     duplex.AddDefaultOption(
         LONG_EDGE, semantic_info.duplex_default == printing::LONG_EDGE);
     duplex.AddDefaultOption(
         SHORT_EDGE, semantic_info.duplex_default == printing::SHORT_EDGE);
     duplex.SaveTo(&description);
   }
 
   ColorCapability color;
   if (semantic_info.color_default || semantic_info.color_changeable) {
-    color.AddDefaultOption(Color(STANDARD_COLOR), semantic_info.color_default);
+    Color standard_color(STANDARD_COLOR);
+    standard_color.vendor_id = base::IntToString(semantic_info.color_model);
+    color.AddDefaultOption(standard_color, semantic_info.color_default);
   }
   if (!semantic_info.color_default || semantic_info.color_changeable) {
-    color.AddDefaultOption(Color(STANDARD_MONOCHROME),
-                           !semantic_info.color_default);
+    Color standard_monochrome(STANDARD_MONOCHROME);
+    standard_monochrome.vendor_id = base::IntToString(semantic_info.bw_model);
+    color.AddDefaultOption(standard_monochrome, !semantic_info.color_default);
   }
   color.SaveTo(&description);
 
 #if defined(OS_WIN)
   if (!semantic_info.papers.empty()) {
     Media default_media(semantic_info.default_paper.name,
                         semantic_info.default_paper.size_um.width(),
                         semantic_info.default_paper.size_um.height());
     default_media.MatchBySize();
 
@@ skipping 51 matching lines @@
   OrientationCapability orientation;
   orientation.AddDefaultOption(PORTRAIT, true);
   orientation.AddOption(LANDSCAPE);
   orientation.AddOption(AUTO_ORIENTATION);
   orientation.SaveTo(&description);
 
   return scoped_ptr<base::DictionaryValue>(description.root().DeepCopy());
 }
 
 }  // namespace cloud_print