Skip to content

GitLab

T
tangled
Commit 674acc2b authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot
Browse files
Options

Upgrade components/policy/core/browser from deprecated base::JSONReader API 

Bug: 1070409
Change-Id: I4e20be0704e7943a93a59e437f4126296c650740
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212232Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771527}
parent b09a4e57
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 57 deletions
components/policy/core/browser/configuration_policy_handler_unittest.cc
View file @ 674acc2b
......@@ -739,13 +739,13 @@ TEST(SchemaValidatingPolicyHandlerTest, CheckAndGetValueInvalid) {
" \"Colors\": \"White\""
" }"
"}";
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_RECOMMENDED,
......@@ -783,13 +783,13 @@ TEST(SchemaValidatingPolicyHandlerTest, CheckAndGetValueUnknown) {
" \"Apples\": \"Red\""
" }"
"}";
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_RECOMMENDED,
......@@ -842,13 +842,13 @@ TEST(SimpleSchemaValidatingPolicyHandlerTest, CheckAndGetValue) {
" \"Colors\": \"Green\""
" }"
"}";
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJson, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map_recommended;
policy_map_recommended.LoadFrom(
......@@ -937,15 +937,13 @@ TEST(SimpleSchemaValidatingPolicyHandlerTest, CheckAndGetValue) {
}
TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, ValidEmbeddedJson) {
std::string error;
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJsonValid, base::JSON_ALLOW_TRAILING_COMMAS, nullptr,
&error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJsonValid, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_MANDATORY,
......@@ -969,15 +967,13 @@ TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, ValidEmbeddedJson) {
}
TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, InvalidEmbeddedJson) {
std::string error;
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJsonInvalid, base::JSON_ALLOW_TRAILING_COMMAS, nullptr,
&error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJsonInvalid, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_MANDATORY,
......@@ -1001,15 +997,13 @@ TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, InvalidEmbeddedJson) {
}
TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, UnparsableJson) {
std::string error;
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJsonUnparsable, base::JSON_ALLOW_TRAILING_COMMAS, nullptr,
&error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJsonUnparsable, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_MANDATORY,
......@@ -1033,15 +1027,13 @@ TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, UnparsableJson) {
}
TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, WrongType) {
std::string error;
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJsonWrongTypes, base::JSON_ALLOW_TRAILING_COMMAS, nullptr,
&error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJsonWrongTypes, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_MANDATORY,
......@@ -1065,15 +1057,13 @@ TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, WrongType) {
}
TEST(SimpleJsonStringSchemaValidatingPolicyHandlerTest, WrongRootType) {
std::string error;
std::unique_ptr<base::Value> policy_map_value =
base::JSONReader::ReadAndReturnErrorDeprecated(
kPolicyMapJsonWrongRootType, base::JSON_ALLOW_TRAILING_COMMAS,
nullptr, &error);
ASSERT_TRUE(policy_map_value) << error;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(
kPolicyMapJsonWrongRootType, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
const base::DictionaryValue* policy_map_dict = nullptr;
ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict));
ASSERT_TRUE(parsed_json.value->GetAsDictionary(&policy_map_dict));
PolicyMap policy_map;
policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_MANDATORY,
......
components/policy/core/browser/policy_pref_mapping_test.cc
View file @ 674acc2b
......@@ -315,14 +315,12 @@ class PolicyTestCases {
ADD_FAILURE();
return;
}
int error_code = -1;
std::string error_string;
base::DictionaryValue* dict = nullptr;
std::unique_ptr<base::Value> value =
base::JSONReader::ReadAndReturnErrorDeprecated(
json, base::JSON_PARSE_RFC, &error_code, &error_string);
if (!value.get() || !value->GetAsDictionary(&dict)) {
ADD_FAILURE() << "Error parsing policy_test_cases.json: " << error_string;
base::JSONReader::ValueWithError parsed_json =
base::JSONReader::ReadAndReturnValueWithError(json);
if (!parsed_json.value || !parsed_json.value->GetAsDictionary(&dict)) {
ADD_FAILURE() << "Error parsing policy_test_cases.json: "
<< parsed_json.error_message;
return;
}
for (const auto& it : dict->DictItems()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment