Completely rewrite the PpdProvider/PpdCache to use the SCS backend. Along the way, clean it up a l…

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 "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()) {
     ref.user_supplied_ppd_url = specifics.user_supplied_ppd_url();
   }
 
-  if (specifics.has_effective_model()) {
-    ref.effective_model = specifics.effective_model();
-
-    if (specifics.has_effective_manufacturer())
-      ref.effective_manufacturer = specifics.effective_manufacturer();
+  if (specifics.has_effective_make_and_model()) {
+    ref.effective_make_and_model = specifics.effective_make_and_model();
   }
 
   return ref;
 }
 
 sync_pb::PrinterPPDReference ReferenceToSpecifics(
     const Printer::PpdReference& ref) {
   sync_pb::PrinterPPDReference specifics;
   if (!ref.user_supplied_ppd_url.empty()) {
     specifics.set_user_supplied_ppd_url(ref.user_supplied_ppd_url);
   }
 
-  if (!ref.effective_model.empty()) {
-    specifics.set_effective_model(ref.effective_model);
-
-    if (!ref.effective_manufacturer.empty())
-      specifics.set_effective_manufacturer(ref.effective_manufacturer);
+  if (!ref.effective_make_and_model.empty()) {
+    specifics.set_effective_make_and_model(ref.effective_make_and_model);
   }
 
   return specifics;
 }
 
 }  // namespace
 
 std::unique_ptr<Printer> SpecificsToPrinter(
     const sync_pb::PrinterSpecifics& specifics) {
   DCHECK(!specifics.id().empty());
@@ skipping 37 matching lines @@
     specifics->set_uuid(printer.uuid());
 
   *specifics->mutable_ppd_reference() =
       ReferenceToSpecifics(printer.ppd_reference());
 
   return specifics;
 }
 
 }  // namespace printing
 }  // namespace chromeos