Revert of Parse HPKP report-uri and persist in TransportSecurityPersister

net/http/transport_security_state.cc

Index: net/http/transport_security_state.cc
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 8ad73581e85a2670ac48fcd5c43e3f7dd2161ba3..a5f43a016ac129a899b6d033d0351f7c6373cb57 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -575,8 +575,7 @@
                                              const base::Time& last_observed,
                                              const base::Time& expiry,
                                              bool include_subdomains,
-                                             const HashValueVector& hashes,
-                                             const GURL& report_uri) {
+                                             const HashValueVector& hashes) {
   DCHECK(CalledOnValidThread());
 
   PKPState pkp_state;
@@ -584,7 +583,6 @@
   pkp_state.expiry = expiry;
   pkp_state.include_subdomains = include_subdomains;
   pkp_state.spki_hashes = hashes;
-  pkp_state.report_uri = report_uri;
 
   EnablePKPHost(host, pkp_state);
 }
@@ -744,17 +742,14 @@
   base::TimeDelta max_age;
   bool include_subdomains;
   HashValueVector spki_hashes;
-  GURL report_uri;
-
   if (!ParseHPKPHeader(value, ssl_info.public_key_hashes, &max_age,
-                       &include_subdomains, &spki_hashes, &report_uri)) {
+                       &include_subdomains, &spki_hashes)) {
     return false;
   }
   // Handle max-age == 0.
   if (max_age.InSeconds() == 0)
     spki_hashes.clear();
-  AddHPKPInternal(host, now, now + max_age, include_subdomains, spki_hashes,
-                  report_uri);
+  AddHPKPInternal(host, now, now + max_age, include_subdomains, spki_hashes);
   return true;
 }
 
@@ -768,11 +763,9 @@
 void TransportSecurityState::AddHPKP(const std::string& host,
                                      const base::Time& expiry,
                                      bool include_subdomains,
-                                     const HashValueVector& hashes,
-                                     const GURL& report_uri) {
-  DCHECK(CalledOnValidThread());
-  AddHPKPInternal(host, base::Time::Now(), expiry, include_subdomains, hashes,
-                  report_uri);
+                                     const HashValueVector& hashes) {
+  DCHECK(CalledOnValidThread());
+  AddHPKPInternal(host, base::Time::Now(), expiry, include_subdomains, hashes);
 }
 
 // static