Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: net/http/transport_security_persister.cc

Issue 374033002: Fixes for re-enabling more MSVC level 4 warnings: net/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comment Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/ftp/ftp_network_transaction_unittest.cc ('k') | net/socket/deterministic_socket_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/transport_security_persister.cc
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc
index 7310b590f7e2d100b10a7678731f733ed1315e6c..a482f614a1afe23e09944a5ad881dac86a69f24a 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -212,9 +212,6 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized,
continue;
}
- std::string mode_string;
- double expiry;
- double dynamic_spki_hashes_expiry = 0.0;
TransportSecurityState::DomainState domain_state;
// kIncludeSubdomains is a legacy synonym for kStsIncludeSubdomains and
@@ -234,6 +231,8 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized,
parsed_include_subdomains = true;
}
+ std::string mode_string;
+ double expiry = 0;
if (!parsed_include_subdomains ||
!parsed->GetString(kMode, &mode_string) ||
!parsed->GetDouble(kExpiry, &expiry)) {
@@ -243,6 +242,7 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized,
}
// Don't fail if this key is not present.
+ double dynamic_spki_hashes_expiry = 0;
parsed->GetDouble(kDynamicSPKIHashesExpiry,
&dynamic_spki_hashes_expiry);
« no previous file with comments | « net/ftp/ftp_network_transaction_unittest.cc ('k') | net/socket/deterministic_socket_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698