Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

5 files changed, 43 insertions, 37 deletions

diff --git a/chromium/net/data/ssl/certificates/subjectAltName_sanity_check.pem b/chromium/net/data/ssl/certificates/subjectAltName_sanity_check.pem
index 46cf58de0cb..bb7f31b4218 100644
--- a/chromium/net/data/ssl/certificates/subjectAltName_sanity_check.pem
+++ b/chromium/net/data/ssl/certificates/subjectAltName_sanity_check.pem
@@ -1,54 +1,55 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            f2:f1:e7:8b:cf:09:30:f1
-        Signature Algorithm: sha1WithRSAEncryption
+        Serial Number: 17778064637999560130 (0xf6b85f9895e5b5c2)
+    Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, ST=California, L=Mountain View, O=Test CA, CN=127.0.0.1
         Validity
-            Not Before: Apr  3 00:46:54 2012 GMT
-            Not After : Apr  1 00:46:54 2022 GMT
+            Not Before: Aug 16 02:31:34 2013 GMT
+            Not After : Aug 14 02:31:34 2023 GMT
         Subject: C=US, ST=California, L=Mountain View, O=Test CA, CN=127.0.0.1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:c8:0e:13:bb:da:d5:5a:d4:68:a2:11:90:ae:c3:
-                    b3:f9:72:52:7d:e9:73:5c:49:60:ef:d3:49:05:9a:
-                    c7:4e:01:4f:b0:c8:4c:18:34:2f:7b:84:27:ad:94:
-                    12:9b:e7:3d:38:6b:49:15:55:f6:c7:3a:8d:03:ec:
-                    3e:59:90:5c:b9:a6:41:af:f0:12:b8:87:b9:54:4d:
-                    1e:18:ba:41:96:d0:f3:bb:a0:d6:80:8e:29:10:72:
-                    eb:3c:4c:c0:e2:f7:d8:61:2f:d8:63:c7:a7:79:f5:
-                    74:e0:2a:f0:5d:3e:eb:a2:36:09:4b:5d:35:31:56:
-                    1c:86:0e:8a:22:ad:1b:3f:27
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:bf:11:d3:18:37:84:53:8b:07:d3:7d:0a:dc:f7:
+                    fc:ed:ce:8d:72:3a:29:af:17:e2:2b:d0:99:5f:3c:
+                    7b:29:a9:a8:3d:02:42:19:82:0b:df:5d:95:ac:60:
+                    d9:08:69:ed:90:36:42:57:39:87:4c:cc:1e:8a:1d:
+                    7e:92:bb:7e:02:df:02:80:48:3f:38:21:cc:e9:d1:
+                    b5:34:01:8f:92:17:ed:97:1d:11:2b:dd:df:fc:74:
+                    f4:d6:66:9f:e3:e5:10:ea:ea:53:b2:a7:78:4b:96:
+                    31:06:38:0b:fa:0f:d8:58:9b:ff:2a:1f:2d:8c:ae:
+                    6c:42:73:4c:d2:cf:1b:b7:d1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
             X509v3 Subject Alternative Name: 
                 IP Address:127.0.0.2, IP Address:FE80:0:0:0:0:0:0:1, DNS:test.example, email:test@test.example, othername:<unsupported>, DirName:/CN=127.0.0.3
     Signature Algorithm: sha1WithRSAEncryption
-        32:46:49:70:be:e4:db:05:0e:7e:7a:e4:ea:5c:90:c6:4c:65:
-        2d:03:ac:fb:d1:de:e4:26:e5:83:dc:5a:c8:4f:ff:b5:10:4e:
-        39:21:7f:c8:37:f3:c6:7a:de:96:b3:30:e7:c7:87:6d:75:1e:
-        14:30:17:6b:d2:76:0b:b8:43:39:c4:63:4c:50:8e:e1:0f:09:
-        ff:6c:7d:ab:c8:97:46:e8:04:70:9d:f5:e5:8c:b6:8c:b7:3d:
-        8e:0f:59:1f:6a:fd:03:c2:be:a1:40:b7:9b:38:ca:55:f5:18:
-        c3:0d:35:01:12:a0:8d:ba:1b:41:a3:6e:68:8c:cf:52:f9:96:
-        90:64
+         ad:99:a8:25:29:15:1f:b8:c7:27:f0:c8:d7:2a:2a:66:54:07:
+         2b:2c:b4:1e:fe:27:07:29:da:22:3d:7a:d8:4d:81:72:78:3e:
+         96:5d:4c:42:ce:8c:c5:d1:d9:b3:ac:92:99:19:e5:2a:32:8a:
+         bc:ce:fb:58:a0:b9:e7:4b:44:d8:0c:2c:30:2f:fa:6c:48:7e:
+         23:77:4f:67:e9:72:83:39:22:6f:2b:4d:25:16:3d:98:be:01:
+         31:a0:55:0a:85:78:b8:b9:9c:66:e6:cb:7b:81:1c:fc:84:d1:
+         79:1b:41:12:21:f8:c9:5b:fd:3c:a6:e4:6d:36:5b:0a:4c:aa:
+         bb:2b
 -----BEGIN CERTIFICATE-----
-MIICsDCCAhmgAwIBAgIJAPLx54vPCTDxMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNV
+MIICwzCCAiygAwIBAgIJAPa4X5iV5bXCMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
-aWV3MRAwDgYDVQQKDAdUZXN0IENBMRIwEAYDVQQDDAkxMjcuMC4wLjEwHhcNMTIw
-NDAzMDA0NjU0WhcNMjIwNDAxMDA0NjU0WjBgMQswCQYDVQQGEwJVUzETMBEGA1UE
+aWV3MRAwDgYDVQQKDAdUZXN0IENBMRIwEAYDVQQDDAkxMjcuMC4wLjEwHhcNMTMw
+ODE2MDIzMTM0WhcNMjMwODE0MDIzMTM0WjBgMQswCQYDVQQGEwJVUzETMBEGA1UE
 CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwH
 VGVzdCBDQTESMBAGA1UEAwwJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDIDhO72tVa1GiiEZCuw7P5clJ96XNcSWDv00kFmsdOAU+wyEwYNC97
-hCetlBKb5z04a0kVVfbHOo0D7D5ZkFy5pkGv8BK4h7lUTR4YukGW0PO7oNaAjikQ
-cus8TMDi99hhL9hjx6d59XTgKvBdPuuiNglLXTUxVhyGDooirRs/JwIDAQABo3Iw
-cDBuBgNVHREEZzBlhwR/AAAChxD+gAAAAAAAAAAAAAAAAAABggx0ZXN0LmV4YW1w
-bGWBEXRlc3RAdGVzdC5leGFtcGxloBIGAyoDBKALDAlpZ25vcmUgbWWkFjAUMRIw
-EAYDVQQDDAkxMjcuMC4wLjMwDQYJKoZIhvcNAQEFBQADgYEAMkZJcL7k2wUOfnrk
-6lyQxkxlLQOs+9He5Cblg9xayE//tRBOOSF/yDfzxnrelrMw58eHbXUeFDAXa9J2
-C7hDOcRjTFCO4Q8J/2x9q8iXRugEcJ315Yy2jLc9jg9ZH2r9A8K+oUC3mzjKVfUY
-ww01ARKgjbobQaNuaIzPUvmWkGQ=
+ADCBiQKBgQC/EdMYN4RTiwfTfQrc9/ztzo1yOimvF+Ir0JlfPHspqag9AkIZggvf
+XZWsYNkIae2QNkJXOYdMzB6KHX6Su34C3wKASD84Iczp0bU0AY+SF+2XHREr3d/8
+dPTWZp/j5RDq6lOyp3hLljEGOAv6D9hYm/8qHy2MrmxCc0zSzxu30QIDAQABo4GE
+MIGBMA8GA1UdEwEB/wQFMAMBAf8wbgYDVR0RBGcwZYcEfwAAAocQ/oAAAAAAAAAA
+AAAAAAAAAYIMdGVzdC5leGFtcGxlgRF0ZXN0QHRlc3QuZXhhbXBsZaASBgMqAwSg
+CwwJaWdub3JlIG1lpBYwFDESMBAGA1UEAwwJMTI3LjAuMC4zMA0GCSqGSIb3DQEB
+BQUAA4GBAK2ZqCUpFR+4xyfwyNcqKmZUBysstB7+Jwcp2iI9ethNgXJ4PpZdTELO
+jMXR2bOskpkZ5SoyirzO+1iguedLRNgMLDAv+mxIfiN3T2fpcoM5Im8rTSUWPZi+
+ATGgVQqFeLi5nGbmy3uBHPyE0XkbQRIh+Mlb/Tym5G02WwpMqrsr
 -----END CERTIFICATE-----
diff --git a/chromium/net/data/ssl/scripts/ee.cnf b/chromium/net/data/ssl/scripts/ee.cnf
index ad786c80ca8..5214f9e97f2 100644
--- a/chromium/net/data/ssl/scripts/ee.cnf
+++ b/chromium/net/data/ssl/scripts/ee.cnf
@@ -29,7 +29,8 @@ CN = Duplicate
 subjectAltName = IP:127.0.0.1
 
 [req_san_sanity]
-subjectAltName = @san_sanity
+basicConstraints = critical, CA:true
+subjectAltName   = @san_sanity
 
 [san_sanity]
 IP.1  = 127.0.0.2
diff --git a/chromium/net/data/url_request_unittest/redirect-test.html.mock-http-headers b/chromium/net/data/url_request_unittest/redirect-test.html.mock-http-headers
index 9fdd1c0b7b9..c59ef583ab0 100644
--- a/chromium/net/data/url_request_unittest/redirect-test.html.mock-http-headers
+++ b/chromium/net/data/url_request_unittest/redirect-test.html.mock-http-headers
@@ -1,2 +1,3 @@
 HTTP/1.1 302 Redirect
 Location: with-headers.html
+Cache-Control: max-age=10000
diff --git a/chromium/net/data/url_request_unittest/redirect-to-data.html b/chromium/net/data/url_request_unittest/redirect-to-data.html
new file mode 100644
index 00000000000..ce013625030
--- /dev/null
+++ b/chromium/net/data/url_request_unittest/redirect-to-data.html
@@ -0,0 +1 @@
+hello
diff --git a/chromium/net/data/url_request_unittest/redirect-to-data.html.mock-http-headers b/chromium/net/data/url_request_unittest/redirect-to-data.html.mock-http-headers
new file mode 100644
index 00000000000..f049471e064
--- /dev/null
+++ b/chromium/net/data/url_request_unittest/redirect-to-data.html.mock-http-headers
@@ -0,0 +1,2 @@
+HTTP/1.1 302 Here I Am
+Location: data:text/html,goodbye