Add an autoconf field to printer objects.

chrome/browser/chromeos/printing/specifics_translation.cc

 // Copyright 2017 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 <memory>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/printing/specifics_translation.h"
 #include "chromeos/printing/printer_configuration.h"
 #include "components/sync/protocol/printer_specifics.pb.h"
 
 namespace chromeos {
 namespace printing {
 
 namespace {
 
 Printer::PpdReference SpecificsToPpd(
     const sync_pb::PrinterPPDReference& specifics) {
   Printer::PpdReference ref;
-  if (specifics.has_user_supplied_ppd_url()) {
+  if (specifics.has_autoconf() && specifics.autoconf()) {

[Carlson, 2017/05/22 23:46:07]

The has_autoconf() here is not needed.

[skau, 2017/05/23 01:00:21]

Done.

+    ref.autoconf = specifics.autoconf();
+  } else if (specifics.has_user_supplied_ppd_url()) {
     ref.user_supplied_ppd_url = specifics.user_supplied_ppd_url();
-  }
-
-  if (specifics.has_effective_make_and_model()) {
+  } else if (specifics.has_effective_make_and_model()) {
     ref.effective_make_and_model = specifics.effective_make_and_model();
   }
 
   return ref;
 }
 
+// Overwrite fields in |specifics| with an appropriately filled field from
+// |ref|.  If |ref| is the default object, nothing will be changed in

[Carlson, 2017/05/22 23:46:07]

Not sure what "default object" means here -- you mean it has no non-default
fields?

That seems like a slightly weird thing to guarantee, semantically.   But if it's
important, this comment should really be in the header.  (Also, the implicit
hierarchy that now exists should be documented in the header) 

+// |specifics|.
 void MergeReferenceToSpecifics(sync_pb::PrinterPPDReference* specifics,
                                const Printer::PpdReference& ref) {
-  if (!ref.user_supplied_ppd_url.empty()) {
+  if (ref.autoconf) {
+    specifics->set_autoconf(ref.autoconf);

[Carlson, 2017/05/22 23:46:07]

You could write each of these as 
if (...) {
specifics->Clear();
specifics->set_some_field(some_value);
}

which might be slightly more future proof if more fields are added later?

[skau, 2017/05/23 01:00:21]

Done.

+    specifics->clear_user_supplied_ppd_url();
+    specifics->clear_effective_make_and_model();
+  } else if (!ref.user_supplied_ppd_url.empty()) {
     specifics->set_user_supplied_ppd_url(ref.user_supplied_ppd_url);
-  }
-
-  if (!ref.effective_make_and_model.empty()) {
+    specifics->clear_autoconf();
+    specifics->clear_effective_make_and_model();
+  } else if (!ref.effective_make_and_model.empty()) {
     specifics->set_effective_make_and_model(ref.effective_make_and_model);
+    specifics->clear_autoconf();
+    specifics->clear_user_supplied_ppd_url();
   }
 }
 
 }  // namespace
 
 std::unique_ptr<Printer> SpecificsToPrinter(
     const sync_pb::PrinterSpecifics& specifics) {
   DCHECK(!specifics.id().empty());
 
   auto printer = base::MakeUnique<Printer>(
@@ skipping 42 matching lines @@
 
   if (!printer.uuid().empty())
     specifics->set_uuid(printer.uuid());
 
   MergeReferenceToSpecifics(specifics->mutable_ppd_reference(),
                             printer.ppd_reference());
 }
 
 }  // namespace printing
 }  // namespace chromeos