BASELINE: Update Chromium to 60.0.3112.70

Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 10 insertions, 10 deletions

diff --git a/chromium/net/http/transport_security_persister.h b/chromium/net/http/transport_security_persister.h
index d4e1e36a2c0..d2fad857491 100644
--- a/chromium/net/http/transport_security_persister.h
+++ b/chromium/net/http/transport_security_persister.h
@@ -44,7 +44,6 @@
 #include "net/http/transport_security_state.h"
 
 namespace base {
-class DictionaryValue;
 class SequencedTaskRunner;
 }
 
@@ -72,7 +71,7 @@ class NET_EXPORT TransportSecurityPersister
   // ImportantFileWriter::DataSerializer:
   //
   // Serializes |transport_security_state_| into |*output|. Returns true if
-  // all STS and PKP states were serialized correctly.
+  // all STS, PKP, and Expect_CT states were serialized correctly.
   //
   // The serialization format is JSON; the JSON represents a dictionary of
   // host:DomainState pairs (host is a string). The DomainState contains
@@ -94,6 +93,15 @@ class NET_EXPORT TransportSecurityPersister
   //     "bad_static_spki_hashes": list of strings
   //         legacy key synonym "bad_preloaded_spki_hashes"
   //     "dynamic_spki_hashes": list of strings
+  //     "dynamic_spki_hashes_expiry": double
+  //     "report-uri": string
+  //     "sts_observed": double
+  //     "pkp_observed": double
+  //     "expect_ct": dictionary with keys:
+  //         "expect_ct_expiry": double
+  //         "expect_ct_observed": double
+  //         "expect_ct_enforce": true|false
+  //         "expect_ct_report_uri": string
   //
   // The JSON dictionary keys are strings containing
   // Base64(SHA256(TransportSecurityState::CanonicalizeHost(domain))).
@@ -119,14 +127,6 @@ class NET_EXPORT TransportSecurityPersister
                           bool* dirty,
                           TransportSecurityState* state);
 
-  // Populates |host| with default values for the STS and PKP states.
-  // These default values represent "null" states and are only useful to keep
-  // the entries in the resulting JSON consistent. The deserializer will ignore
-  // "null" states.
-  // TODO(davidben): This can be removed when the STS and PKP states are stored
-  // independently on disk. https://crbug.com/470295
-  void PopulateEntryWithDefaults(base::DictionaryValue* host);
-
   void CompleteLoad(const std::string& state);
 
   TransportSecurityState* transport_security_state_;