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

chromeos/printing/printer_translator_unittest.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 <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chromeos/printing/printer_configuration.h"
 #include "chromeos/printing/printer_translator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace printing {
 
 // Printer test data
 const char kGUID[] = "GUID-GUID-GUID";
 const char kName[] = "Chrome Super Printer";
 const char kDescription[] = "first star on the left";
 const char kMake[] = "Chrome";
 const char kModel[] = "Inktastic Laser Magic";
 const char kUri[] = "ipp://printy.domain.co:555/ipp/print";
 const char kUUID[] = "UUID-UUID-UUID";
 
 // PpdReference test data
 const char kUserSuppliedPpdUrl[] = "/some/path/to/user.url";
-const char kEffectiveManufacturer[] = "Ehch Pea";
-const char kEffectiveModel[] = "PrintBlaster 2000";
+const char kEffectiveMakeAndModel[] = "PrintBlaster 2000";
 
 TEST(PrinterTranslatorTest, PrefToPrinterMissingId) {
   base::DictionaryValue value;
   std::unique_ptr<Printer> printer = PrefToPrinter(value);
 
   EXPECT_FALSE(printer);
 }
 
 TEST(PrinterTranslatorTest, PrefToPrinter) {
   base::DictionaryValue preference;
@@ skipping 34 matching lines @@
   base::ExpectDictStringValue(kMake, *pref, "manufacturer");
   base::ExpectDictStringValue(kModel, *pref, "model");
   base::ExpectDictStringValue(kUri, *pref, "uri");
   base::ExpectDictStringValue(kUUID, *pref, "uuid");
 }
 
 TEST(PrinterTranslatorTest, PrinterToPrefPpdReference) {
   Printer printer("UNIQUE_ID");
   auto* ppd = printer.mutable_ppd_reference();
   ppd->user_supplied_ppd_url = kUserSuppliedPpdUrl;
-  ppd->effective_manufacturer = kEffectiveManufacturer;
-  ppd->effective_model = kEffectiveModel;
+  ppd->effective_make_and_model = kEffectiveMakeAndModel;
 
   std::unique_ptr<base::DictionaryValue> actual = PrinterToPref(printer);
 
   base::ExpectDictStringValue(kUserSuppliedPpdUrl, *actual,
                               "ppd_reference.user_supplied_ppd_url");
-  base::ExpectDictStringValue(kEffectiveManufacturer, *actual,
-                              "ppd_reference.effective_manufacturer");
-  base::ExpectDictStringValue(kEffectiveModel, *actual,
+  base::ExpectDictStringValue(kEffectiveMakeAndModel, *actual,
                               "ppd_reference.effective_model");
 }
 
 // Make sure we don't serialize empty fields.
 TEST(PrinterTranslatorTest, PrinterToPrefPpdReferenceLazy) {
   Printer printer("UNIQUE_ID");
   std::unique_ptr<base::DictionaryValue> actual = PrinterToPref(printer);
 
   EXPECT_FALSE(actual->HasKey("ppd_reference.user_supplied_ppd_url"));
-  EXPECT_FALSE(actual->HasKey("ppd_reference.effective_manufacturer"));
-  EXPECT_FALSE(actual->HasKey("ppd_reference.effective_model"));
+  EXPECT_FALSE(actual->HasKey("ppd_reference.ppd_server_key"));
 }
 
 TEST(PrinterTranslatorTest, PrefToPrinterRoundTrip) {
   base::DictionaryValue preference;
   preference.SetString("id", kGUID);
   preference.SetString("display_name", kName);
   preference.SetString("description", kDescription);
   preference.SetString("manufacturer", kMake);
   preference.SetString("model", kModel);
   preference.SetString("uri", kUri);
   preference.SetString("uuid", kUUID);
 
   preference.SetString("ppd_reference.user_supplied_ppd_url",
                        kUserSuppliedPpdUrl);
-  preference.SetString("ppd_reference.effective_manufacturer",
-                       kEffectiveManufacturer);
-  preference.SetString("ppd_reference.effective_model", kEffectiveModel);
+  preference.SetString("ppd_reference.effective_model", kEffectiveMakeAndModel);
 
   std::unique_ptr<Printer> printer = PrefToPrinter(preference);
   std::unique_ptr<base::DictionaryValue> pref_copy = PrinterToPref(*printer);
 
   EXPECT_TRUE(preference.Equals(pref_copy.get()));
 }
 
 }  // namespace printing
 }  // namespace chromeos