Update to Chromium version 105.0.5176.0 (#1023155)

This commit is contained in:
Marshall Greenblatt
2022-07-21 13:26:10 -04:00
parent 5e753d211f
commit e9f29ab3d6
92 changed files with 615 additions and 700 deletions

View File

@ -60,16 +60,14 @@ CefRefPtr<CefValue> CefParseJSONAndReturnError(
const std::string& json = json_string.ToString();
std::string error_msg;
base::JSONReader::ValueWithError value_and_error =
base::JSONReader::ReadAndReturnValueWithError(
json, GetJSONReaderOptions(options));
if (value_and_error.value) {
auto result = base::JSONReader::ReadAndReturnValueWithError(
json, GetJSONReaderOptions(options));
if (result.has_value()) {
return new CefValueImpl(
base::Value::ToUniquePtrValue(std::move(value_and_error.value.value()))
.release());
base::Value::ToUniquePtrValue(std::move(*result)).release());
}
error_msg_out = value_and_error.error_message;
error_msg_out = result.error().message;
return nullptr;
}