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

net/http/transport_security_state.cc

 // 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.
 
 #include "net/http/transport_security_state.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/ecdsa.h>
 #include <openssl/ssl.h>
 #else  // !defined(USE_OPENSSL)
@@ skipping 1015 matching lines @@
   }
 
   if (enable_static_pins_ && result.has_pins) {
     pkp_state->include_subdomains = result.pkp_include_subdomains;
     pkp_state->last_observed = base::GetBuildTime();
 
     if (result.pinset_id >= arraysize(kPinsets))
       return false;
     const Pinset *pinset = &kPinsets[result.pinset_id];
 
+    if (pinset->report_uri != kNoReportUri)

[agl, 2015/08/07 23:10:01]

Will need to be kNoReportURI since I changed the capitalisation to meet my own,
selfish desires for Go style I'm afraid.

[estark, 2015/08/10 05:34:26]

Done.

+      pkp_state->report_uri = GURL(pinset->report_uri);
+
     if (pinset->accepted_pins) {
       const char* const* sha1_hash = pinset->accepted_pins;
       while (*sha1_hash) {
         AddHash(*sha1_hash, &pkp_state->spki_hashes);
         sha1_hash++;
       }
     }
     if (pinset->rejected_pins) {
       const char* const* sha1_hash = pinset->rejected_pins;
       while (*sha1_hash) {
@@ skipping 180 matching lines @@
 TransportSecurityState::PKPStateIterator::PKPStateIterator(
     const TransportSecurityState& state)
     : iterator_(state.enabled_pkp_hosts_.begin()),
       end_(state.enabled_pkp_hosts_.end()) {
 }
 
 TransportSecurityState::PKPStateIterator::~PKPStateIterator() {
 }
 
 }  // namespace