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

chromeos/printing/printer_translator.cc

Index: chromeos/printing/printer_translator.cc
diff --git a/chromeos/printing/printer_translator.cc b/chromeos/printing/printer_translator.cc
index 38150d035c06c518a36655478065382cbc4e7026..b559ec4dff965bdc8c3ae9aa9f78f4cc8edb6ddc 100644
--- a/chromeos/printing/printer_translator.cc
+++ b/chromeos/printing/printer_translator.cc
@@ -21,7 +21,8 @@ namespace {
 
 // PPD reference fields
 const char kUserSuppliedPpdUrl[] = "user_supplied_ppd_url";
-const char kEffectiveManufacturer[] = "effective_manufacturer";
+// TODO(justincarlson) -- This should be changed to effective_make_and_model to
+// match the implementation.
 const char kEffectiveModel[] = "effective_model";
 
 // printer fields
@@ -40,8 +41,7 @@ Printer::PpdReference DictionaryToPpdReference(
     const base::DictionaryValue* value) {
   Printer::PpdReference ppd;
   value->GetString(kUserSuppliedPpdUrl, &ppd.user_supplied_ppd_url);
-  value->GetString(kEffectiveManufacturer, &ppd.effective_manufacturer);
-  value->GetString(kEffectiveModel, &ppd.effective_model);
+  value->GetString(kEffectiveModel, &ppd.effective_make_and_model);
   return ppd;
 }
 
@@ -52,11 +52,8 @@ std::unique_ptr<base::DictionaryValue> PpdReferenceToDictionary(
   if (!ppd.user_supplied_ppd_url.empty()) {
     dictionary->SetString(kUserSuppliedPpdUrl, ppd.user_supplied_ppd_url);
   }
-  if (!ppd.effective_manufacturer.empty()) {
-    dictionary->SetString(kEffectiveManufacturer, ppd.effective_manufacturer);
-  }
-  if (!ppd.effective_model.empty()) {
-    dictionary->SetString(kEffectiveModel, ppd.effective_model);
+  if (!ppd.effective_make_and_model.empty()) {
+    dictionary->SetString(kEffectiveModel, ppd.effective_make_and_model);
   }
   return dictionary;
 }