| Index: chrome/test/data/policy/policy_test_cases.json | 
| diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json | 
| index 5fc4837ad387ba8c444d60d69ba1c7c569d92f22..d89eec0b7ea29d088ea4d60254fe4fa61064467e 100644 | 
| --- a/chrome/test/data/policy/policy_test_cases.json | 
| +++ b/chrome/test/data/policy/policy_test_cases.json | 
| @@ -204,75 +204,73 @@ | 
| "RemoteAccessHostFirewallTraversal": { | 
| "os": [], | 
| "test_policy": { "RemoteAccessHostFirewallTraversal": true }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_firewall_traversal" } | 
| -    ], | 
|  | 
| "note": "TODO(frankf): Enable on all OS after crbug.com/121066 is fixed." | 
| }, | 
|  | 
| "RemoteAccessHostRequireTwoFactor": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostRequireTwoFactor": false }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_require_two_factor" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostRequireTwoFactor": false } | 
| }, | 
|  | 
| "RemoteAccessHostDomain": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostDomain": "" }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_domain" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostDomain": "" } | 
| }, | 
|  | 
| "RemoteAccessHostTalkGadgetPrefix": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostTalkGadgetPrefix": "chromoting-host" }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_talkgadget_prefix" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostTalkGadgetPrefix": "chromoting-host" } | 
| }, | 
|  | 
| "RemoteAccessHostRequireCurtain": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostRequireCurtain": false }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_require_curtain" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostRequireCurtain": false } | 
| }, | 
|  | 
| "RemoteAccessHostAllowClientPairing": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostAllowClientPairing": true }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_allow_client_pairing" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostAllowClientPairing": true } | 
| }, | 
|  | 
| "RemoteAccessHostAllowGnubbyAuth": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostAllowGnubbyAuth": true }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_allow_gnubby_auth" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostAllowGnubbyAuth": true } | 
| }, | 
|  | 
| "RemoteAccessHostAllowRelayedConnection": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostAllowRelayedConnection": true }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_allow_relayed_connection" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostAllowRelayedConnection": true } | 
| }, | 
|  | 
| "RemoteAccessHostUdpPortRange": { | 
| "os": [], | 
| -    "test_policy": { "RemoteAccessHostUdpPortRange": "12400-12409" }, | 
| -    "pref_mappings": [ | 
| -      { "pref": "remote_access.host_udp_port_range" } | 
| -    ] | 
| +    "test_policy": { "RemoteAccessHostUdpPortRange": "12400-12409" } | 
| +  }, | 
| + | 
| +  "RemoteAccessHostMatchUsername": { | 
| +    "os": [], | 
| +    "test_policy": { "RemoteAccessHostMatchUsername": true } | 
| +  }, | 
| + | 
| +  "RemoteAccessHostTokenUrl": { | 
| +    "os": [], | 
| +    "test_policy": { "RemoteAccessHostTokenUrl": "https://example.com/issue" } | 
| +  }, | 
| + | 
| +  "RemoteAccessHostTokenValidationUrl": { | 
| +    "os": [], | 
| +    "test_policy": { "RemoteAccessHostTokenValidationUrl": "https://example.com/validate" } | 
| +  }, | 
| + | 
| +  "RemoteAccessHostTokenValidationCertificateIssuer": { | 
| +    "os": [], | 
| +    "test_policy": { "RemoteAccessHostTokenValidationCertificateIssuer": "Example Certificate Authority" } | 
| +  }, | 
| + | 
| +  "RemoteAccessHostDebugOverridePolicies": { | 
| +    "os": [], | 
| +    "test_policy": { "RemoteAccessHostDebugOverridePolicies": "{ \"RemoteAccessHostMatchUsername\": true }" } | 
| }, | 
|  | 
| "PrintingEnabled": { | 
|  |