Add vendor id and custom display name to media selection

components/cloud_devices/common/printer_description_unittest.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 "components/cloud_devices/common/printer_description.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
@@ skipping 118 matching lines @@
     "        'height_microns': 3333"
     "      }, {"
     "        'name': 'ISO_A6',"
     "        'width_microns': 4444,"
     "        'height_microns': 5555"
     "      }, {"
     "        'name': 'JPN_YOU4',"
     "        'width_microns': 6666,"
     "        'height_microns': 7777"
     "      }, {"
+    "        'name': 'CUSTOM',"
     "        'width_microns': 1111,"
     "        'is_continuous_feed': true,"
-    "        'custom_display_name': 'FEED'"
+    "        'custom_display_name': 'Feed',"
+    "        'vendor_id': 'FEED'"
     "      } ]"
     "    },"
     "    'collate': {"
     "      'default': false"
     "    },"
     "    'reverse_order': {"
     "      'default': true"
     "    }"
     "  }"
     "}";
@@ skipping 205 matching lines @@
 
   fit_to_page.AddDefaultOption(NO_FITTING, true);
   fit_to_page.AddOption(FIT_TO_PAGE);
   fit_to_page.AddOption(GROW_TO_PAGE);
   fit_to_page.AddOption(SHRINK_TO_PAGE);
   fit_to_page.AddOption(FILL_PAGE);
 
   media.AddDefaultOption(Media(NA_LETTER, 2222, 3333), true);
   media.AddOption(Media(ISO_A6, 4444, 5555));
   media.AddOption(Media(JPN_YOU4, 6666, 7777));
-  media.AddOption(Media("FEED", 1111, 0));
+  media.AddOption(Media("Feed", "FEED", 1111, 0));
 
   collate.set_default_value(false);
   reverse.set_default_value(true);
 
   content_types.SaveTo(&description);
   color.SaveTo(&description);
   duplex.SaveTo(&description);
   orientation.SaveTo(&description);
   copies.SaveTo(&description);
   margins.SaveTo(&description);
@@ skipping 78 matching lines @@
   EXPECT_TRUE(fit_to_page.Contains(NO_FITTING));
   EXPECT_TRUE(fit_to_page.Contains(FIT_TO_PAGE));
   EXPECT_TRUE(fit_to_page.Contains(GROW_TO_PAGE));
   EXPECT_TRUE(fit_to_page.Contains(SHRINK_TO_PAGE));
   EXPECT_TRUE(fit_to_page.Contains(FILL_PAGE));
   EXPECT_EQ(NO_FITTING, fit_to_page.GetDefault());
 
   EXPECT_TRUE(media.Contains(Media(NA_LETTER, 2222, 3333)));
   EXPECT_TRUE(media.Contains(Media(ISO_A6, 4444, 5555)));
   EXPECT_TRUE(media.Contains(Media(JPN_YOU4, 6666, 7777)));
-  EXPECT_TRUE(media.Contains(Media("FEED", 1111, 0)));
+  EXPECT_TRUE(media.Contains(Media("Feed", "FEED", 1111, 0)));
   EXPECT_EQ(Media(NA_LETTER, 2222, 3333), media.GetDefault());
 
   EXPECT_FALSE(collate.default_value());
   EXPECT_TRUE(reverse.default_value());
 
   EXPECT_EQ(NormalizeJson(kCdd), NormalizeJson(description.ToString()));
 }
 
 TEST(PrinterDescriptionTest, CjtInit) {
   CloudDeviceDescription description;
@@ skipping 132 matching lines @@
   EXPECT_EQ(media.value(), Media(ISO_C7C6, 4261, 334));
   EXPECT_FALSE(collate.value());
   EXPECT_TRUE(reverse.value());
 
   EXPECT_EQ(NormalizeJson(kCjt), NormalizeJson(description.ToString()));
 }
 
 }  // namespace printer
 
 }  // namespace cloud_devices