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

Index: chrome/browser/chromeos/printing/specifics_translation.cc
diff --git a/chrome/browser/chromeos/printing/specifics_translation.cc b/chrome/browser/chromeos/printing/specifics_translation.cc
index 1b65c82ad9009a1e5bb3e9b5f0a50842d94634c8..78503a1f2e0156448c0a71e72a50028019d91550 100644
--- a/chrome/browser/chromeos/printing/specifics_translation.cc
+++ b/chrome/browser/chromeos/printing/specifics_translation.cc
@@ -24,11 +24,8 @@ Printer::PpdReference SpecificsToPpd(
     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;
@@ -41,11 +38,8 @@ sync_pb::PrinterPPDReference ReferenceToSpecifics(
     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;