Update enterprise reporting to use the new Policy conversions.

Turn off convert types and pretty print.

Use default value of no convert value, no device data and includes user
policies.

Bug: 983174
Change-Id: I8815e4f66c5b7326cf337fb610a2dfbebc4d3f63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1721078Reviewed-by: Yann Dago <ydago@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681413}

chrome/browser/enterprise_reporting/policy_info_unittest.cc

@@ -84,12 +84,12 @@ TEST_F(PolicyInfoTest, ChromePolicy) {
 
   EXPECT_CALL(*policy_service(), GetPolicies(_));
 
-  AppendChromePolicyInfoIntoProfileReport(
-      policy::GetAllPolicyValuesAsDictionary(
-          profile(), /* with_user_policies */ true, /* convert_values */ false,
-          /* with_device_data*/ false,
-          /* is_pretty_print */ false, /* convert_types */ false),
-      &profile_info);
+  AppendChromePolicyInfoIntoProfileReport(policy::DictionaryPolicyConversions()
+                                              .WithBrowserContext(profile())
+                                              .EnableConvertTypes(false)
+                                              .EnablePrettyPrint(false)
+                                              .ToValue(),
+                                          &profile_info);
   EXPECT_EQ(2, profile_info.chrome_policies_size());
 
   auto policy1 = profile_info.chrome_policies(0);
@@ -131,8 +131,11 @@ TEST_F(PolicyInfoTest, ExtensionPolicy) {
                               std::make_unique<base::Value>(3), nullptr);
   em::ChromeUserProfileInfo profile_info;
   AppendExtensionPolicyInfoIntoProfileReport(
-      policy::GetAllPolicyValuesAsDictionary(profile(), true, false, false,
-                                             false, false),
+      policy::DictionaryPolicyConversions()
+          .WithBrowserContext(profile())
+          .EnableConvertTypes(false)
+          .EnablePrettyPrint(false)
+          .ToValue(),
       &profile_info);
   // The second extension is not in the report because it has no policy.
   EXPECT_EQ(1, profile_info.extension_policies_size());

chrome/browser/enterprise_reporting/profile_report_generator.cc

@@ -59,10 +59,11 @@ void ProfileReportGenerator::MaybeGenerate(const base::FilePath& path,
 
   if (policies_enabled_) {
     // TODO(crbug.com/983151): Upload policy error as their IDs.
-    policies_ = policy::GetAllPolicyValuesAsDictionary(
-        profile_, /* with_user_policies */ true, /* convert_values */ false,
-        /* with_device_data*/ false,
-        /* is_pretty_print */ false, /* convert_types */ false);
+    policies_ = policy::DictionaryPolicyConversions()
+                    .WithBrowserContext(profile_)
+                    .EnableConvertTypes(false)
+                    .EnablePrettyPrint(false)
+                    .ToValue();
     GetChromePolicyInfo();
     GetExtensionPolicyInfo();
     GetPolicyFetchTimestampInfo();