Introduce the field make_and_model for synced printers.

chromeos/printing/printer_translator.cc

 // 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.
 
 #include "chromeos/printing/printer_translator.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 47 matching lines @@
     printer->set_description(description);
 
   std::string manufacturer;
   if (value.GetString(kManufacturer, &manufacturer))
     printer->set_manufacturer(manufacturer);
 
   std::string model;
   if (value.GetString(kModel, &model))
     printer->set_model(model);
 
+  std::string make_and_model = manufacturer;
+  if (!make_and_model.empty() && !model.empty())
+    make_and_model.append(" ");
+  make_and_model.append(model);

[Carlson, 2017/06/28 17:38:36]

Nit:  I think it's a little clearer if this line is pulled into the if.

[skau, 2017/06/28 21:25:35]

But that wouldn't be equivalent.  If model is not empty and make_and_model is
empty, then make_and_model should be equal to model.  If I put it in the if,
then make_and_model would be empty in this case.

[Carlson, 2017/06/28 22:22:04]

Indeed, I fail at logic today.  Alas!

Can I suggest that the if at 69 be slightly changed to

if (!manufacturer.empty() && !model.empty())

as I think the clearer parallelism might have made me fail less at basic logic
comprehension.  :)

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

Done.

+  printer->set_make_and_model(make_and_model);
+
   std::string uuid;
   if (value.GetString(kUUID, &uuid))
     printer->set_uuid(uuid);
 
   return true;
 }
 
 }  // namespace
 
 namespace printing {
@@ skipping 28 matching lines @@
     // Make and model is mandatory
     LOG(WARNING) << "Missing model information for policy printer.";
     return nullptr;
   }
 
   return printer;
 }
 
 }  // namespace printing
 }  // namespace chromeos