Introduce the field make_and_model for synced printers.

components/sync/protocol/printer_specifics.proto

Index: components/sync/protocol/printer_specifics.proto
diff --git a/components/sync/protocol/printer_specifics.proto b/components/sync/protocol/printer_specifics.proto
index 9713d6329081a587d73966c3c5e6ab3edfa5b59e..facc5be2437950908cc502fb0a01c37d1e20967b 100644
--- a/components/sync/protocol/printer_specifics.proto
+++ b/components/sync/protocol/printer_specifics.proto
@@ -41,10 +41,12 @@ message PrinterSpecifics {
   optional string description = 3;
 
   // Printer manufacturer.  Should be a known manufacturuer.
-  optional string manufacturer = 4;
+  // Deprecated in favor of make_and_model.
+  optional string manufacturer = 4 [deprecated = true];
 
   // Printer model.  Should match a known model for the manufacturer.
-  optional string model = 5;
+  // Deprecated in favor of make_and_model.
+  optional string model = 5 [deprecated = true];
 
   // Universal Resource Identifier for the printer on the network.  usb:// will
   // be the scheme for USB printers.  Example
@@ -63,4 +65,9 @@ message PrinterSpecifics {
 
   // Timestamp when printer was last updated.
   optional int64 updated_timestamp = 10;
+
+  // The make and model of the printer in one string.  The typical arrangement
+  // for this is '<Make> <Model>'.  This aligns with the typical formatting of

[skym, 2017/06/28 22:14:33]

Not that it really matters, but you're not being consistent with capitalization
of <Make> or <make>, specifics_translation.cc uses lowercase.

[skau, 2017/06/28 22:41:06]

Done.

+  // the IPP attribute printer-make-and-model.
+  optional string make_and_model = 11;
 }