Rename ONC field Trust to TrustBits.

BUG=159058, 216495

Review URL: https://chromiumcodereview.appspot.com/13473003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193111 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 10 insertions, 11 deletions

diff --git a/chromeos/test/data/network/certificate-server-update.onc b/chromeos/test/data/network/certificate-server-update.onc
index 45db3bd..c17e869 100644
--- a/chromeos/test/data/network/certificate-server-update.onc
+++ b/chromeos/test/data/network/certificate-server-update.onc
@@ -2,8 +2,8 @@
   "Certificates": [
     {
       "GUID": "{f998f760-272b-6939-4c2beffe428697ab}",
-      "Trust": [
-        "Web"
+      "TrustBits": [
+        "Web", "Foo" // Test that certs with unknown flags are still imported.
       ],
       "Type": "Server",
       "X509": "MIICWDCCAcECAxAAATANBgkqhkiG9w0BAQQFADCBkzEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMREwDwYDVQQLEwhDaHJvbWVPUzEiMCAGCSqGSIb3DQEJARYTZ3NwZW5jZXJAZ29vZ2xlLmNvbTEaMBgGA1UEBxMRTW91bnRhaW4gVmlldywgQ0ExCzAJBgNVBAgTAkNBMQswCQYDVQQGEwJVUzENMAsGA1UEAxMEbG1hbzAeFw0xMTAzMTYyMzQ5MzhaFw0xMjAzMTUyMzQ5MzhaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMREwDwYDVQQLEwhDaHJvbWVPUzENMAsGA1UEAxMEbG1hbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA31WiJ9LvprrhKtDlW0RdLFAO7Qjkvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIALtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZTQ/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dMVPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACRWA=="
diff --git a/chromeos/test/data/network/certificate-server.onc b/chromeos/test/data/network/certificate-server.onc
index 2a820e3..604e6ec 100644
--- a/chromeos/test/data/network/certificate-server.onc
+++ b/chromeos/test/data/network/certificate-server.onc
@@ -2,8 +2,8 @@
   "Certificates": [
     {
       "GUID": "{f998f760-272b-6939-4c2beffe428697aa}",
-      "Trust": [
-        "Web"
+      "TrustBits": [
+        "Web", "Foo" // Test that certs with unknown flags are still imported.
       ],
       "Type": "Server",
       "X509": "leading junk \n-----BEGIN CERTIFICATE-----  \nMIICWDCCAcECAxAAATANBgkqhkiG9w0BAQQFADCBkzEVMBMGA1UEChMMR29vZ2xlLCBJbm\nMuMREwDwYDVQQLEwhDaHJvbWVPUzEiMCAGCSqGSIb3DQEJARYTZ3NwZW5jZXJAZ29vZ2xl\nLmNvbTEaMBgGA1UEBxMRTW91bnRhaW4gVmlldywgQ0ExCzAJBgNVBAgTAkNBMQswCQYDVQ\nQGEwJVUzENMAsGA1UEAxMEbG1hbzAeFw0xMTAzMTYyMzQ5MzhaFw0xMjAzMTUyMzQ5Mzha\nMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMR\nEwDwYDVQQLEwhDaHJvbWVPUzENMAsGA1UEAxMEbG1hbzCBnzANBgkqhkiG9w0BAQEFAAOB\njQAwgYkCgYEA31WiJ9LvprrhKtDlW0RdLFAO7Qjkvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4\nF/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIALtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgC\nQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAA\nOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZTQ/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZ\nPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dMVPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdr\noKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACRWA==\n-----END CERTIFICATE-----    \ntrailing junk"
diff --git a/chromeos/test/data/network/certificate-web-authority-update.onc b/chromeos/test/data/network/certificate-web-authority-update.onc
index ca0de2d..2462cc7 100644
--- a/chromeos/test/data/network/certificate-web-authority-update.onc
+++ b/chromeos/test/data/network/certificate-web-authority-update.onc
@@ -2,7 +2,7 @@
   "Certificates": [
     {
       "GUID": "{f998f760-272b-6939-4c2beffe428697ac}",
-      "Trust": [
+      "TrustBits": [
         "Web"
       ],
       "Type": "Authority",
diff --git a/chromeos/test/data/network/certificate-web-authority.onc b/chromeos/test/data/network/certificate-web-authority.onc
index 81e316d..f2e8aba 100644
--- a/chromeos/test/data/network/certificate-web-authority.onc
+++ b/chromeos/test/data/network/certificate-web-authority.onc
@@ -2,7 +2,7 @@
   "Certificates": [
     {
       "GUID": "{f998f760-272b-6939-4c2beffe428697ab}",
-      "Trust": [
+      "TrustBits": [
         "Web"
       ],
       "Type": "Authority",
diff --git a/chromeos/test/data/network/invalid_settings_with_repairs.json b/chromeos/test/data/network/invalid_settings_with_repairs.json
index 96b9b49..1e03c6f 100644
--- a/chromeos/test/data/network/invalid_settings_with_repairs.json
+++ b/chromeos/test/data/network/invalid_settings_with_repairs.json
@@ -261,7 +261,7 @@
     "toplevel-with-server-and-ca-cert": {
       "Type": "UnencryptedConfiguration",
       "Certificates":
-      [ { "Trust": ["Web"],
+      [ { "TrustBits": ["Web"],
           "GUID": "1",
           "Type": "Authority",
           "X509": "abc" },
diff --git a/chromeos/test/data/network/managed_toplevel2.onc b/chromeos/test/data/network/managed_toplevel2.onc
index 60690bb..b0826d4 100644
--- a/chromeos/test/data/network/managed_toplevel2.onc
+++ b/chromeos/test/data/network/managed_toplevel2.onc
@@ -75,13 +75,12 @@
   ],
   "Certificates": [
     {
-      "Trust": [],
+      "TrustBits": [],  // Test that the empty array is imported correctly.
       "GUID": "{58ac1967-a0e7-49e9-be68-123abc}",
       "Type": "Authority",
       "X509": "MIIDojCCAwugAwIBAgIJAKGvi5ZgEWDVMA0GCSqGSIb3DQEBBAUAMIGTMRUwEwYDVQQKEwxHb29nbGUsIEluYy4xETAPBgNVBAsTCENocm9tZU9TMSIwIAYJKoZIhvcNAQkBFhNnc3BlbmNlckBnb29nbGUuY29tMRowGAYDVQQHExFNb3VudGFpbiBWaWV3LCBDQTELMAkGA1UECBMCQ0ExCzAJBgNVBAYTAlVTMQ0wCwYDVQQDEwRsbWFvMB4XDTExMDMxNjIzNDcxMFoXDTEyMDMxNTIzNDcxMFowgZMxFTATBgNVBAoTDEdvb2dsZSwgSW5jLjERMA8GA1UECxMIQ2hyb21lT1MxIjAgBgkqhkiG9w0BCQEWE2dzcGVuY2VyQGdvb2dsZS5jb20xGjAYBgNVBAcTEU1vdW50YWluIFZpZXcsIENBMQswCQYDVQQIEwJDQTELMAkGA1UEBhMCVVMxDTALBgNVBAMTBGxtYW8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMDX6BQz2JUzIAVjetiXxDznd2wdqVqVHfNkbSRW+xBywgqUaIXmFEGUol7VzPfmeFV8o8ok/eFlQB0h6ycqgwwMd0KjtJs2ys/k0F5GuN0G7fsgr+NRnhVgxj21yF6gYTN/8a9kscla/svdmp8ekexbALFnghbLBx3CgcqUxT+tAgMBAAGjgfswgfgwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUbYygbSkl4kpjCNuxoezFGupA97UwgcgGA1UdIwSBwDCBvYAUbYygbSkl4kpjCNuxoezFGupA97WhgZmkgZYwgZMxFTATBgNVBAoTDEdvb2dsZSwgSW5jLjERMA8GA1UECxMIQ2hyb21lT1MxIjAgBgkqhkiG9w0BCQEWE2dzcGVuY2VyQGdvb2dsZS5jb20xGjAYBgNVBAcTEU1vdW50YWluIFZpZXcsIENBMQswCQYDVQQIEwJDQTELMAkGA1UEBhMCVVMxDTALBgNVBAMTBGxtYW+CCQChr4uWYBFg1TANBgkqhkiG9w0BAQQFAAOBgQCDq9wiQ4uVuf1CQU3sXfXCy1yqi5m8AsO9FxHvah5/SVFNwKllqTfedpCaWEswJ55YAojW9e+pY2Fh3Fo/Y9YkF88KCtLuBjjqDKCRLxF4LycjHODKyQQ7mN/t5AtP9yKOsNvWF+M4IfReg51kohau6FauQx87by5NIRPdkNPvkQ=="
     },
     {
-      "Trust": [],
       "GUID": "{42cb13cd-140c-4941-9fb6-456def}",
       "Type": "Authority",
       "X509": "MIICijCCAfOgAwIBAgIJAPYTFSuNYH3DMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFjAUBgNVBAMMDW15LmRvbWFpbi5jb20wIBcNMTIxMTI5MTIxOTMwWhgPMjExMjExMDUxMjE5MzBaMF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFjAUBgNVBAMMDW15LmRvbWFpbi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGU4ZFREFcUB5M6CNmgR6m2HHI6qL8dLBFH3jVe+FIUWyrF3UtBQrhPtD7tC+3qsoRHDquHo3oVedOG2B22hQ3TUTvkO2YmL0pv9RsaRRbhYD8YqqpmWPq94nZNF13y007LwJLuwLU/8kikrNgmnT7meWVSAcLYLsbgjYaZmn2XAgMBAAGjUDBOMB0GA1UdDgQWBBTX5f2mCM32pbNdXrsKmRHeZlcxOjAfBgNVHSMEGDAWgBTX5f2mCM32pbNdXrsKmRHeZlcxOjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGUj0fZr2UzZjacnGhHf9x9FeQt8VALyASCw4JQyxbhB8YHjKS+IF80X8OkDiJrjkM6IOBTtyG0n0ozEgTL9m5NqWuAB2+SPkRpDgabI6mIUR/l1tkQarKCdKzYQ3+oggkiHiHXl2uC4sutgsyt54KQaQxx04+9z2WRt9yI6I1NW"
diff --git a/chromeos/test/data/network/toplevel_openvpn_clientcert.onc b/chromeos/test/data/network/toplevel_openvpn_clientcert.onc
index 0c27a6e..c4ff4a4 100644
--- a/chromeos/test/data/network/toplevel_openvpn_clientcert.onc
+++ b/chromeos/test/data/network/toplevel_openvpn_clientcert.onc
@@ -7,7 +7,7 @@
     },
     {
       "GUID": "{55ca78f6-0842-4e1b-96a3-09a9e1a26ef5}",
-      "Trust": [
+      "TrustBits": [
         "Web"
       ],
       "Type": "Authority",
diff --git a/chromeos/test/data/network/toplevel_wifi_eap_clientcert.onc b/chromeos/test/data/network/toplevel_wifi_eap_clientcert.onc
index 6e01a10..a800e3a 100644
--- a/chromeos/test/data/network/toplevel_wifi_eap_clientcert.onc
+++ b/chromeos/test/data/network/toplevel_wifi_eap_clientcert.onc
@@ -37,7 +37,7 @@
         "Type": "Client"
     },
     {
-      "Trust": [
+      "TrustBits": [
         "Web"
       ],
       "GUID": "{f5f2c9c9-0079-a712-49da21137af62fdd}",