Fix PolicyPrefTest.

1. For UnsafelyTreatInsecureOriginAsSecure there is a typo
in the policy_test_cases.json file: s/securex/secure/.
2. For SecurityKeyPermitAttestation the policy mapping was incorrectly
put in a ifdef that excluded mac which makes it fail on mac.

BUG=none

Change-Id: I5f0f3b289452bf86fc66f0396cb13f82c8dcea5e
Reviewed-on: https://chromium-review.googlesource.com/804314
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521079}

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -465,6 +465,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     prefs::kWebRTCUDPPortRange,
     base::Value::Type::STRING },
 #endif  // BUILDFLAG(ENABLE_WEBRTC)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  { key::kSecurityKeyPermitAttestation,
+    prefs::kSecurityKeyPermitAttestation,
+    base::Value::Type::LIST },
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 #if !defined(OS_MACOSX)
   { key::kFullscreenAllowed,
     prefs::kFullscreenAllowed,
@@ -473,9 +478,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kFullscreenAllowed,
     extensions::pref_names::kAppFullscreenAllowed,
     base::Value::Type::BOOLEAN },
-  { key::kSecurityKeyPermitAttestation,
-    prefs::kSecurityKeyPermitAttestation,
-    base::Value::Type::LIST },
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 #endif  // !defined(OS_MACOSX)
 

chrome/test/data/policy/policy_test_cases.json

@@ -33,7 +33,7 @@
   "UnsafelyTreatInsecureOriginAsSecure": {
     "os": ["win", "linux", "max", "chromeos", "android"],
     "test_policy": { "UnsafelyTreatInsecureOriginAsSecure": ["http://example.com/"] },
-    "pref_mappings": [ { "pref": "unsafely_treat_insecure_origin_as_securex" } ]
+    "pref_mappings": [ { "pref": "unsafely_treat_insecure_origin_as_secure" } ]
   },
 
   "HomepageLocation": {