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

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>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chromeos/printing/printer_configuration.h"
 
 using base::DictionaryValue;
 
 namespace chromeos {
 
 namespace {
 
 // PPD reference fields
 const char kUserSuppliedPpdUrl[] = "user_supplied_ppd_url";
-const char kEffectiveManufacturer[] = "effective_manufacturer";
-const char kEffectiveModel[] = "effective_model";
+const char kEffectiveMakeAndModel[] = "effective_make_and_model";

[skau, 2017/01/27 01:37:01]

Leave the constants alone for now.  The Policy proto will take some time to
change and the local keys are going to get removed.

[Carlson, 2017/01/27 18:48:43]

Not sure how that migration will work, but ok.

 
 // printer fields
 const char kDisplayName[] = "display_name";
 const char kDescription[] = "description";
 const char kManufacturer[] = "manufacturer";
 const char kModel[] = "model";
 const char kUri[] = "uri";
 const char kPpdReference[] = "ppd_reference";
 const char kUUID[] = "uuid";
 
 // The name of the PpdResource for policy printers.
 const char kPpdResource[] = "ppd_resource";
 
 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(kEffectiveMakeAndModel, &ppd.effective_make_and_model);
   return ppd;
 }
 
 // Convert a PpdReference struct to a DictionaryValue.
 std::unique_ptr<base::DictionaryValue> PpdReferenceToDictionary(
     const Printer::PpdReference& ppd) {
   auto dictionary = base::MakeUnique<DictionaryValue>();
   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(kEffectiveMakeAndModel, ppd.effective_make_and_model);
   }
   return dictionary;
 }
 
 // Converts |value| into a Printer object for the fields that are shared
 // between pref printers and policy printers.
 std::unique_ptr<Printer> DictionaryToPrinter(const DictionaryValue& value) {
   std::string id;
   if (!value.GetString(printing::kPrinterId, &id)) {
     LOG(WARNING) << "Record id required";
@@ skipping 77 matching lines @@
   const DictionaryValue* ppd;
   if (pref.GetDictionary(kPpdResource, &ppd)) {
     *printer->mutable_ppd_reference() = DictionaryToPpdReference(ppd);
   }
 
   return printer;
 }
 
 }  // namespace printing
 }  // namespace chromeos