Add paper size reporting for CUPS printers (to let user to select one in the Print Preview).

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"
 
@@ skipping 37 matching lines @@
     color.AddDefaultOption(standard_color, semantic_info.color_default);
   }
   if (!semantic_info.color_default || semantic_info.color_changeable) {
     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 (!semantic_info.papers.empty()) {
-    Media default_media(semantic_info.default_paper.name,
-                        "",
+    Media default_media(semantic_info.default_paper.display_name,
+                        semantic_info.default_paper.vendor_id,
                         semantic_info.default_paper.size_um.width(),
                         semantic_info.default_paper.size_um.height());
     default_media.MatchBySize();
 
     MediaCapability media;
     bool is_default_set = false;
     for (size_t i = 0; i < semantic_info.papers.size(); ++i) {
       gfx::Size paper_size = semantic_info.papers[i].size_um;
       if (paper_size.width() > paper_size.height())
         paper_size.SetSize(paper_size.height(), paper_size.width());
-      Media new_media(semantic_info.papers[i].name,
-                      "",
+      Media new_media(semantic_info.papers[i].display_name,
+                      semantic_info.papers[i].vendor_id,
                       paper_size.width(),
                       paper_size.height());
       new_media.MatchBySize();
       if (new_media.IsValid() && !media.Contains(new_media)) {
         if (!default_media.IsValid())
           default_media = new_media;
         media.AddDefaultOption(new_media, new_media == default_media);
         is_default_set = is_default_set || (new_media == default_media);
       }
     }
@@ skipping 34 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