Introduce the field make_and_model for synced printers.

components/sync/protocol/printer_specifics.proto

 // Copyright 2016 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.
 //
 // Sync protocol datatype extension for printer data.
 
 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
 // any fields in this file.
 
 syntax = "proto2";
@@ skipping 23 matching lines @@
   // Printer record GUID
   optional string id = 1;
 
   // User visible name.  Any string.
   optional string display_name = 2;
 
   // User visible description.  Any string.
   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
   // ipp://address.example:port/queue/queue/queue.
   optional string uri = 6;
 
   // Universally Unique Identifier provided by the printer.  Used for unique
   // identification of printers in a zeroconf environment.
   optional string uuid = 7;
 
   // PPDData was deprecated in favor of PPDReference format.
   optional bytes ppd = 8 [deprecated = true];
 
   // Structure representing the user's ppd configuration.
   optional PrinterPPDReference ppd_reference = 9;
 
   // 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
+  // the IPP attribute printer-make-and-model.
+  optional string make_and_model = 11;
 }