printing: use ty field

This change modifies the ZeroconfPrinterDetector to use the ty
field specified in the ParsedMetadata class (instead of the
product field) when calling Printer::set_make_and_model().

Bug: chromium:1062865
Fixed: chromium:1062865
Test: chromeos_unittests
Change-Id: I7b1b742b402843cfa6e2d43f6318085ff578b2bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2399572Reviewed-by: Sean Kau <skau@chromium.org>
Commit-Queue: Kalvin Lee <kdlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805942}

chrome/browser/chromeos/printing/zeroconf_printer_detector.cc

@@ -154,7 +154,7 @@ bool ConvertToPrinter(const std::string& service_type,
   printer.set_uuid(metadata.UUID);
   printer.set_display_name(service_description.instance_name());
   printer.set_description(metadata.note);
-  printer.set_make_and_model(metadata.product);
+  printer.set_make_and_model(metadata.ty);
   Uri uri;
   std::string rp = metadata.rp;
   if (service_type == ZeroconfPrinterDetector::kIppServiceName ||

chrome/browser/chromeos/printing/zeroconf_printer_detector_unittest.cc

@@ -104,10 +104,10 @@ PrinterDetector::DetectedPrinter MakeExpectedPrinter(const std::string& name,
   printer.set_uuid(base::StrCat({name, "_UUID"}));
   printer.set_display_name(name);
   printer.set_description(base::StrCat({name, "_note"}));
-  printer.set_make_and_model(base::StrCat({name, "_product"}));
-  detected.ppd_search_data.make_and_model.push_back(
-      base::StrCat({name, "_ty"}));
+  printer.set_make_and_model(base::StrCat({name, "_ty"}));
   detected.ppd_search_data.make_and_model.push_back(printer.make_and_model());
+  detected.ppd_search_data.make_and_model.push_back(
+      base::StrCat({name, "_product"}));
   if (GetUsbFor(name)) {
     // We should get an effective make and model guess from the usb fields
     // if they exist.