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 630d75b95440551072908c127f574da18ee66b69..6f27fea8cdbf7e86909f1a966955ce4c2f4417a3 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -2,11 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// This file is generated by net/tools/transport_security_state_generator/.
+
 #ifndef NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_
 #define NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_
 
 #include <stdint.h>
 
+#include "net/http/transport_security_state_structs.h"
+
 enum SecondLevelDomainName {
   DOMAIN_NOT_PINNED,
   DOMAIN_GOOGLE_COM,
@@ -577,7 +581,7 @@ static const char kSPKIHash_YahooBackup2[] =
 
 static const char* const kExpectCTReportURIs[] = {
     "https://clients3.google.com/ct_upload",
-    "https://log.getdropbox.com/log/expectct",
+    "https://log.getdropbox.com/log/expectct", NULL,

[Ryan Sleevi, 2017/03/13 18:31:18]

Doesn't this require a generator update? Is this dependent on that CL?

If so, can you make sure these nullptr

[martijnc, 2017/03/13 21:51:40]

Yes, but that change (including the NULLs) already landed. Not sure why this
showed up here.
I'll do the NULL -> nullptr change in a separate CL, there are other NULL's that
can be replaced in this file (and in the generator).

 };
 
 static const char* const kExpectStapleReportURIs[] = {
@@ -585,6 +589,7 @@ static const char* const kExpectStapleReportURIs[] = {
     "https://log.getdropbox.com/log/ocsp_expect_staple",
     "https://reporting.caddyserver.com/expect-staple",
     "https://asac.casa/expectstaple.jsp",
+    NULL,
 };
 
 // kNoRejectedPublicKeys is a placeholder for when no public keys are rejected.
@@ -776,13 +781,7 @@ static const char* const kYahooAcceptableCerts[] = {
     NULL,
 };
 
-struct Pinset {
-  const char* const* const accepted_pins;
-  const char* const* const rejected_pins;
-  const char* const report_uri;
-};
-
-static const struct Pinset kPinsets[] = {
+static const net::Pinset kPinsets[] = {
     {kDropboxAcceptableCerts, kNoRejectedPublicKeys, kDropboxReportURI},
     {kFacebookAcceptableCerts, kNoRejectedPublicKeys, kNoReportURI},
     {kGoogleAcceptableCerts, kNoRejectedPublicKeys, kGoogleReportURI},
@@ -16342,4 +16341,11 @@ static const uint8_t kPreloadedHSTSData[] = {
 static const unsigned kPreloadedHSTSBits = 1490365;
 static const unsigned kHSTSRootPosition = 1489692;
 
+static const net::TransportSecurityStateSource kHSTSSource = {
+    kHSTSHuffmanTree,        sizeof(kHSTSHuffmanTree),
+    kPreloadedHSTSData,      kPreloadedHSTSBits,
+    kHSTSRootPosition,       kExpectCTReportURIs,
+    kExpectStapleReportURIs, kPinsets,
+    arraysize(kPinsets)};
+
 #endif  // NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_