diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/net/http/transport_security_persister.cc | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
| download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/net/http/transport_security_persister.cc')
| -rw-r--r-- | chromium/net/http/transport_security_persister.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/net/http/transport_security_persister.cc b/chromium/net/http/transport_security_persister.cc index 7310b590f7e..82a4b51401c 100644 --- a/chromium/net/http/transport_security_persister.cc +++ b/chromium/net/http/transport_security_persister.cc @@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop/message_loop.h" @@ -97,7 +97,7 @@ namespace net { TransportSecurityPersister::TransportSecurityPersister( TransportSecurityState* state, const base::FilePath& profile_path, - base::SequencedTaskRunner* background_runner, + const scoped_refptr<base::SequencedTaskRunner>& background_runner, bool readonly) : transport_security_state_(state), writer_(profile_path.AppendASCII("TransportSecurity"), background_runner), @@ -108,7 +108,7 @@ TransportSecurityPersister::TransportSecurityPersister( transport_security_state_->SetDelegate(this); base::PostTaskAndReplyWithResult( - background_runner_, + background_runner_.get(), FROM_HERE, base::Bind(&::LoadState, writer_.path()), base::Bind(&TransportSecurityPersister::CompleteLoad, @@ -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); |