Allow preloaded pins to contain report URIs; remove special-case reporting

net/http/transport_security_state_static.json

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the HSTS preloaded list in a machine readable format.
 
 // The top-level element is a dictionary with two keys: "pinsets" maps details
 // of certificate pinning to a name and "entries" contains the HSTS details for
 // each host.
 //
 // "pinsets" is a list of objects. Each object has the following members:
 //   name: (string) the name of the pinset
 //   static_spki_hashes: (list of strings) the set of allowed SPKIs hashes
 //   bad_static_spki_hashes: (optional list of strings) the set of forbidden
 //       SPKIs hashes
+//   report_uri: (optional string) the URI to send violation reports to;
+//       reports will be in the format defined in RFC 7469
 //
 // For a given pinset, a certificate is accepted if at least one of the
 // "static_spki_hashes" SPKIs is found in the chain and none of the
 // "bad_static_spki_hashes" SPKIs are. SPKIs are specified as names, which must
 // match up with the file of certificates.
 //
 // "entries" is a list of objects. Each object has the following members:
 //   name: (string) the DNS name of the host in question
 //   include_subdomains: (optional bool) whether subdomains of |name| are also
 //       covered
 //   mode: (optional string) "force-https" iff covered names should require
 //       HTTPS
 //   pins: (optional string) the |name| member of an object in |pinsets|
 
 {
   "pinsets": [
     {
       "name": "test",
       "static_spki_hashes": [
         "TestSPKI"
       ]
     },
     {
       "name": "google",
       "static_spki_hashes": [
         "GoogleBackup2048",
         "GoogleG2",
         "GeoTrustGlobal"
-      ]
+      ],
+      "report_uri": "http://clients3.google.com/cert_upload_json"
     },
     {
       "name": "tor",
       "static_spki_hashes": [
         "RapidSSL",
         "DigiCertEVRoot",
         "Tor1",
         "Tor2",
         "Tor3"
       ]
@@ skipping 3601 matching lines @@
     "SPIDEROAK_COM",
     "BLOGGER_COM",
     "CHROME_COM",
     "GVT3_COM",
     "GVT2_COM",
     "GOOGLE",
     "GGPHT_COM",
     "BLOGSPOT_COM"
   ]
 }