Commit dbd6ef7c authored by Owen Min's avatar Owen Min Committed by Commit Bot

Update policy_ui_handler to use new Policy conversions.

GetAllPolicyValuesAsArray is replaced with ArrayPolicyConversions.
Enable policy value conversion.

Use default settings that includes user policies, disable device data,
enable pretty print and convert policy types to string.

GetAllPolicyValuesAsDictionary is replaced with DictionaryPolicyConversions.
All config is set to defaults. Pretty print, policy type conversion and
user policies are enabled. Device data and policy value conversions are
disabled.

Bug: 983174
Change-Id: I75d8f59a2f268145d762dad6793d8966c0f80592
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725031
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682325}
parent 583c5131
...@@ -923,11 +923,10 @@ base::Value PolicyUIHandler::GetPolicyNames() const { ...@@ -923,11 +923,10 @@ base::Value PolicyUIHandler::GetPolicyNames() const {
} }
base::Value PolicyUIHandler::GetPolicyValues() const { base::Value PolicyUIHandler::GetPolicyValues() const {
return policy::GetAllPolicyValuesAsArray( return policy::ArrayPolicyConversions()
web_ui()->GetWebContents()->GetBrowserContext(), .WithBrowserContext(web_ui()->GetWebContents()->GetBrowserContext())
true /* with_user_policies */, true /* convert_values */, .EnableConvertValues(true)
false /* with_device_data */, true /* is_pretty_print */, .ToValue();
true /* convert_types */);
} }
void PolicyUIHandler::SendStatus() { void PolicyUIHandler::SendStatus() {
...@@ -1030,11 +1029,10 @@ void DoWritePoliciesToJSONFile(const base::FilePath& path, ...@@ -1030,11 +1029,10 @@ void DoWritePoliciesToJSONFile(const base::FilePath& path,
void PolicyUIHandler::WritePoliciesToJSONFile( void PolicyUIHandler::WritePoliciesToJSONFile(
const base::FilePath& path) const { const base::FilePath& path) const {
constexpr bool is_pretty_print = true; base::Value dict =
base::Value dict = policy::GetAllPolicyValuesAsDictionary( policy::DictionaryPolicyConversions()
web_ui()->GetWebContents()->GetBrowserContext(), .WithBrowserContext(web_ui()->GetWebContents()->GetBrowserContext())
true /* with_user_policies */, false /* convert_values */, .ToValue();
false /* with_device_data */, is_pretty_print, true /* convert_types */);
base::Value chrome_metadata(base::Value::Type::DICTIONARY); base::Value chrome_metadata(base::Value::Type::DICTIONARY);
...@@ -1085,8 +1083,7 @@ void PolicyUIHandler::WritePoliciesToJSONFile( ...@@ -1085,8 +1083,7 @@ void PolicyUIHandler::WritePoliciesToJSONFile(
std::string json_policies; std::string json_policies;
base::JSONWriter::WriteWithOptions( base::JSONWriter::WriteWithOptions(
dict, (is_pretty_print ? base::JSONWriter::OPTIONS_PRETTY_PRINT : 0), dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_policies);
&json_policies);
base::PostTaskWithTraits( base::PostTaskWithTraits(
FROM_HERE, FROM_HERE,
......
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