Remove JSONReader::ReadDeprecated() usage in printing code.

Bug: 925165
Change-Id: Ibf858e7112066876c996fada5b7518ad88c81562
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895881Reviewed-by: Luum Habtemariam <luum@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712407}

chrome/browser/chromeos/printing/enterprise_printers_provider.cc

@@ -112,10 +112,10 @@ class EnterprisePrintersProviderImpl : public EnterprisePrintersProvider,
     std::vector<std::string> data =
         FromPrefs(prefs::kRecommendedNativePrinters);
     for (const auto& printer_json : data) {
-      std::unique_ptr<base::DictionaryValue> printer_dictionary =
-          base::DictionaryValue::From(base::JSONReader::ReadDeprecated(
-              printer_json, base::JSON_ALLOW_TRAILING_COMMAS));
-      if (!printer_dictionary) {
+      base::Optional<base::Value> printer_dictionary = base::JSONReader::Read(
+          printer_json, base::JSON_ALLOW_TRAILING_COMMAS);
+      if (!printer_dictionary.has_value() ||
+          !printer_dictionary.value().is_dict()) {
         LOG(WARNING) << "Ignoring invalid printer.  Invalid JSON object: "
                      << printer_json;
         continue;
@@ -125,15 +125,17 @@ class EnterprisePrintersProviderImpl : public EnterprisePrintersProvider,
       // unique so we'll hash the record.  This will not collide with the
       // UUIDs generated for user entries.
       std::string id = base::MD5String(printer_json);
-      printer_dictionary->SetString(kPrinterId, id);
+      printer_dictionary.value().SetStringKey(kPrinterId, id);
 
-      auto new_printer = RecommendedPrinterToPrinter(*printer_dictionary);
+      auto new_printer = RecommendedPrinterToPrinter(
+          base::Value::AsDictionaryValue(printer_dictionary.value()));
       if (!new_printer) {
         LOG(WARNING) << "Recommended printer is malformed.";
         continue;
       }
 
-      if (!recommended_printers_.insert({id, *new_printer}).second) {
+      bool inserted = recommended_printers_.insert({id, *new_printer}).second;
+      if (!inserted) {
         // Printer is already in the list.
         LOG(WARNING) << "Duplicate printer ignored: " << id;
         continue;

chrome/service/cloud_print/print_system_cups.cc

@@ -530,10 +530,9 @@ bool PrintSystemCUPS::ValidatePrintTicket(
     const std::string& print_ticket_data,
     const std::string& print_ticket_mime_type) {
   DCHECK(initialized_);
-  std::unique_ptr<base::DictionaryValue> ticket_value(
-      base::DictionaryValue::From(
-          base::JSONReader::ReadDeprecated(print_ticket_data)));
-  return !!ticket_value;
+  base::Optional<base::Value> ticket =
+      base::JSONReader::Read(print_ticket_data);
+  return ticket.has_value() && ticket.value().is_dict();
 }
 
 // Print ticket on linux is a JSON string containing only one dictionary.
@@ -541,19 +540,15 @@ bool PrintSystemCUPS::ParsePrintTicket(
     const std::string& print_ticket,
     std::map<std::string, std::string>* options) {
   DCHECK(options);
-  std::unique_ptr<base::DictionaryValue> ticket_value(
-      base::DictionaryValue::From(
-          base::JSONReader::ReadDeprecated(print_ticket)));
-  if (!ticket_value)
+  base::Optional<base::Value> ticket = base::JSONReader::Read(print_ticket);
+  if (!ticket.has_value() || !ticket.value().is_dict())
     return false;
 
   options->clear();
-  for (const auto& it : *ticket_value) {
-    std::string value;
-    if (it.second->GetAsString(&value))
-      (*options)[it.first] = value;
+  for (const auto& it : ticket.value().DictItems()) {
+    if (it.second.is_string())
+      (*options)[it.first] = it.second.GetString();
   }
-
   return true;
 }
 

chromeos/printing/ppd_provider.cc

@@ -862,10 +862,9 @@ class PpdProviderImpl : public PpdProvider {
       FailQueuedMetadataResolutions(PpdProvider::SERVER_ERROR);
       return;
     }
-    auto top_list =
-        base::ListValue::From(base::JSONReader::ReadDeprecated(contents));
 
-    if (top_list.get() == nullptr) {
+    base::Optional<base::Value> top_list = base::JSONReader::Read(contents);
+    if (!top_list.has_value() || !top_list.value().is_list()) {
       // We got something malformed back.
       FailQueuedMetadataResolutions(PpdProvider::INTERNAL_ERROR);
       return;
@@ -874,7 +873,7 @@ class PpdProviderImpl : public PpdProvider {
     // This should just be a simple list of locale strings.
     std::vector<std::string> available_locales;
     bool found_en = false;
-    for (const base::Value& entry : *top_list) {
+    for (const base::Value& entry : top_list.value().GetList()) {
       std::string tmp;
       // Locales should have at *least* a two-character country code.  100 is an
       // arbitrary upper bound for length to protect against extreme bogosity.
@@ -1076,17 +1075,15 @@ class PpdProviderImpl : public PpdProvider {
       //  [0x5926, "some othercanonical name"]
       // ]
       // So we scan through the response looking for our desired device id.
-      auto top_list =
-          base::ListValue::From(base::JSONReader::ReadDeprecated(buffer));
-
-      if (top_list.get() == nullptr) {
+      base::Optional<base::Value> top_list = base::JSONReader::Read(buffer);
+      if (!top_list.has_value() || !top_list.value().is_list()) {
         // We got something malformed back.
         LOG(ERROR) << "Malformed top list";
         result = PpdProvider::INTERNAL_ERROR;
       } else {
         // We'll set result to SUCCESS if we do find the device.
         result = PpdProvider::NOT_FOUND;
-        for (const auto& entry : *top_list) {
+        for (const auto& entry : top_list.value().GetList()) {
           int device_id;
           const base::ListValue* sub_list;
 
@@ -1280,13 +1277,12 @@ class PpdProviderImpl : public PpdProvider {
       return fetch_result;
     }
 
-    auto ret_list =
-        base::ListValue::From(base::JSONReader::ReadDeprecated(buffer));
-    if (ret_list == nullptr) {
+    base::Optional<base::Value> ret_list = base::JSONReader::Read(buffer);
+    if (!ret_list.has_value() || !ret_list.value().is_list()) {
       return PpdProvider::INTERNAL_ERROR;
     }
-    *top_list = std::move(ret_list->GetList());
 
+    *top_list = std::move(ret_list.value().GetList());
     for (const auto& entry : *top_list) {
       if (!entry.is_list()) {
         return PpdProvider::INTERNAL_ERROR;

printing/print_settings_conversion_unittest.cc

@@ -48,12 +48,10 @@ const char kPrinterSettings[] = R"({
 }  // namespace
 
 TEST(PrintSettingsConversionTest, ConversionTest) {
-  std::unique_ptr<base::Value> value =
-      base::JSONReader::ReadDeprecated(kPrinterSettings);
-  ASSERT_TRUE(value);
+  base::Optional<base::Value> value = base::JSONReader::Read(kPrinterSettings);
+  ASSERT_TRUE(value.has_value());
   PrintSettings settings;
-  bool success = PrintSettingsFromJobSettings(
-      base::Value::FromUniquePtrValue(std::move(value)), &settings);
+  bool success = PrintSettingsFromJobSettings(value.value(), &settings);
   ASSERT_TRUE(success);
 #if defined(OS_CHROMEOS)
   EXPECT_TRUE(settings.send_user_info());
@@ -64,13 +62,11 @@ TEST(PrintSettingsConversionTest, ConversionTest) {
 
 #if defined(OS_CHROMEOS)
 TEST(PrintSettingsConversionTest, ConversionTest_DontSendUsername) {
-  std::unique_ptr<base::Value> value =
-      base::JSONReader::ReadDeprecated(kPrinterSettings);
-  ASSERT_TRUE(value);
+  base::Optional<base::Value> value = base::JSONReader::Read(kPrinterSettings);
+  ASSERT_TRUE(value.has_value());
   value->SetKey(kSettingSendUserInfo, base::Value(false));
   PrintSettings settings;
-  bool success = PrintSettingsFromJobSettings(
-      base::Value::FromUniquePtrValue(std::move(value)), &settings);
+  bool success = PrintSettingsFromJobSettings(value.value(), &settings);
   ASSERT_TRUE(success);
   EXPECT_FALSE(settings.send_user_info());
   EXPECT_EQ("", settings.username());