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

net/http/transport_security_state_static.h

Index: net/http/transport_security_state_static.h
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h
index 2e0d2ec97d730c1437e2d8af7be749116f7b7088..4b56bf6cba236857b743f9901d09074f5e4878d4 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -538,6 +538,9 @@ static const char* const kNoRejectedPublicKeys[] = {
   NULL,
 };
 
+// kNoReportUri is a placeholder for when a pinset does not have a report URI.
+static const char kNoReportUri[] = "";
+
 static const char* const kTestAcceptableCerts[] = {
   kSPKIHash_TestSPKI,
   NULL,
@@ -548,6 +551,8 @@ static const char* const kGoogleAcceptableCerts[] = {
   kSPKIHash_GeoTrustGlobal,
   NULL,
 };
+static const char kGoogleReportUri[] =
+    "http://clients3.google.com/cert_upload_json";
 static const char* const kTorAcceptableCerts[] = {
   kSPKIHash_RapidSSL,
   kSPKIHash_DigiCertEVRoot,
@@ -666,17 +671,18 @@ static const char* const kSpideroakAcceptableCerts[] = {
 struct Pinset {
   const char *const *const accepted_pins;
   const char *const *const rejected_pins;
+  const char* const report_uri;
 };
 
 static const struct Pinset kPinsets[] = {
-  {kTestAcceptableCerts, kNoRejectedPublicKeys},
-  {kGoogleAcceptableCerts, kNoRejectedPublicKeys},
-  {kTorAcceptableCerts, kNoRejectedPublicKeys},
-  {kTwitterComAcceptableCerts, kNoRejectedPublicKeys},
-  {kTwitterCDNAcceptableCerts, kNoRejectedPublicKeys},
-  {kDropboxAcceptableCerts, kNoRejectedPublicKeys},
-  {kFacebookAcceptableCerts, kNoRejectedPublicKeys},
-  {kSpideroakAcceptableCerts, kNoRejectedPublicKeys},
+    {kTestAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kGoogleAcceptableCerts, kNoRejectedPublicKeys, kGoogleReportUri},
+    {kTorAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kTwitterComAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kTwitterCDNAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kDropboxAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kFacebookAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
+    {kSpideroakAcceptableCerts, kNoRejectedPublicKeys, kNoReportUri},
 };
 
 // kHSTSHuffmanTree describes a Huffman tree. The nodes of the tree are pairs