Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr142] ReadAndReturnValueWithError dropped default arg

Browse Source 
It is now necessary to specifify the options when calling
`JSONReader::ReadAndReturnValueWithError`. This change passes the
previous defaul value to all callers that were relying on the default.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/f52309a095eaa08941f9ff90bd83c0829e01b055

commit f52309a095eaa08941f9ff90bd83c0829e01b055
Author: Daniel Cheng <dcheng@chromium.org>
Date:   Fri Sep 26 13:54:27 2025 -0700

    Remove base::JSONReader::ReadAndReturnValueWithError's default argument for parsing options

    Callers should be explicit if they need to opt into non-compliant JSON
    parsing that allows Chromium-specific extensions, e.g. comments.

    Bug: 446188265
    Change-Id: I2a543447c9c82c08e241c35956884f424be3d48e
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6980536
    Mega-CQ: Daniel Cheng <dcheng@chromium.org>
    Commit-Queue: Daniel Cheng <dcheng@chromium.org>
    Reviewed-by: Alex Gough <ajgo@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1521538}
This commit is contained in:
Claudio DeSouza
2025-10-15 20:31:24 -04:00
committed by Emerick Rogul
parent be7d777326
commit 7dec53867f
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/brave_referrals/browser/brave_referrals_service.cc
+4 -4
View File
@@ -246,8 +246,8 @@ void BraveReferralsService::OnReferralInitLoadComplete(
return;
}
auto parsed_json =
base::JSONReader::ReadAndReturnValueWithError(*response_body);
auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(
*response_body, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_json.has_value() || !parsed_json->is_dict()) {
LOG(ERROR) << "Failed to parse referral initialization response: "
<< (!parsed_json.has_value() ? parsed_json.error().message
@@ -296,8 +296,8 @@ void BraveReferralsService::OnReferralFinalizationCheckLoadComplete(
return;
}
auto parsed_json =
base::JSONReader::ReadAndReturnValueWithError(*response_body);
auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(
*response_body, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_json.has_value() || !parsed_json->is_dict()) {
LOG(ERROR) << "Failed to parse referral finalization check response: "
<< (!parsed_json.has_value() ? parsed_json.error().message
components/brave_wallet/browser/keyring_service.cc
+2 -1
View File
@@ -1420,7 +1420,8 @@ void KeyringService::ImportEthereumAccountFromJson(
return;
}
auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(json);
auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(
json, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_json.has_value() || !parsed_json->is_dict()) {
std::move(callback).Run({});
return;
components/p3a/star_randomness_points.cc
+2 -1
View File
@@ -130,7 +130,8 @@ void StarRandomnessPoints::HandleRandomnessResponse(
}
url_loaders_[log_type] = nullptr;
base::JSONReader::Result parsed_body =
base::JSONReader::ReadAndReturnValueWithError(*response_body);
base::JSONReader::ReadAndReturnValueWithError(
*response_body, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_body.has_value() || !parsed_body.value().is_dict()) {
LOG(ERROR) << "StarRandomnessPoints: failed to parse randomness "
"response json: "
components/url_sanitizer/core/browser/url_sanitizer_service.cc
+4 -4
View File
@@ -54,8 +54,8 @@ std::optional<base::flat_set<std::string>> CreateParamsList(
URLSanitizerService::Config ParseConfig(
const URLSanitizerComponentInstaller::RawConfig& raw_config) {
auto parsed_json =
base::JSONReader::ReadAndReturnValueWithError(raw_config.matchers);
auto parsed_json = base::JSONReader::ReadAndReturnValueWithError(
raw_config.matchers, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_json.has_value()) {
VLOG(1) << "Error parsing feature JSON [matchers]: "
<< parsed_json.error().message;
@@ -92,8 +92,8 @@ URLSanitizerService::Config ParseConfig(
std::move(*params));
}
parsed_json =
base::JSONReader::ReadAndReturnValueWithError(raw_config.permissions);
parsed_json = base::JSONReader::ReadAndReturnValueWithError(
raw_config.permissions, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!parsed_json.has_value()) {
VLOG(1) << "Error parsing feature JSON [permission]: "
<< parsed_json.error().message;
components/web_discovery/browser/patterns.cc
+2 -1
View File
@@ -289,7 +289,8 @@ const PatternsURLDetails* PatternsGroup::GetMatchingURLPattern(
std::unique_ptr<PatternsGroup> ParsePatterns(std::string_view patterns_json) {
base::AssertLongCPUWorkAllowed();
const auto patterns_parse_result =
base::JSONReader::ReadAndReturnValueWithError(patterns_json);
base::JSONReader::ReadAndReturnValueWithError(
patterns_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS);
if (!patterns_parse_result.has_value()) {
VLOG(1) << "Failed to parse patterns JSON: "
<< patterns_parse_result.error().ToString();