diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 18:26:28 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:19 +0000 |
commit | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (patch) | |
tree | d0bdc1f0ef144bb63ed75b8e6fcfb6f039628210 /src/core/profile_io_data_qt.cpp | |
parent | 1e89fa4226be870d97d3b21c6c7087886c81bbc5 (diff) |
Adaptations for Chromium 68
Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu>
Change-Id: I805246b6f01cb151fff48588744408c676d87c14
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/profile_io_data_qt.cpp')
-rw-r--r-- | src/core/profile_io_data_qt.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index 0bc28ba46..d51ff2bb1 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -40,6 +40,7 @@ #include "profile_io_data_qt.h" #include "base/task_scheduler/post_task.h" +#include "components/certificate_transparency/ct_known_logs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/browsing_data_remover.h" #include "content/public/browser/cookie_store_factory.h" @@ -47,8 +48,8 @@ #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" #include "net/cert/cert_verifier.h" -#include "net/cert/ct_known_logs.h" #include "net/cert/ct_log_verifier.h" +#include "net/cert/ct_policy_enforcer.h" #include "net/cert/multi_log_ct_verifier.h" #include "net/extras/sqlite/sqlite_channel_id_store.h" #include "net/http/http_auth_handler_factory.h" @@ -268,9 +269,10 @@ void ProfileIODataQt::generateStorage() m_storage->set_cert_verifier(net::CertVerifier::CreateDefault()); std::unique_ptr<net::MultiLogCTVerifier> ct_verifier(new net::MultiLogCTVerifier()); - ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); +// FIXME: +// ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); m_storage->set_cert_transparency_verifier(std::move(ct_verifier)); - m_storage->set_ct_policy_enforcer(base::WrapUnique(new net::CTPolicyEnforcer)); + m_storage->set_ct_policy_enforcer(base::WrapUnique(new net::DefaultCTPolicyEnforcer())); std::unique_ptr<net::HostResolver> host_resolver(net::HostResolver::CreateDefaultResolver(NULL)); @@ -282,7 +284,7 @@ void ProfileIODataQt::generateStorage() m_storage->set_proxy_resolution_service(network::CreateProxyResolutionServiceUsingMojoFactory( std::move(m_proxyResolverFactory), std::unique_ptr<net::ProxyConfigService>(proxyConfigService), - std::make_unique<net::PacFileFetcherImpl>(m_urlRequestContext.get()), + net::PacFileFetcherImpl::Create(m_urlRequestContext.get()), m_dhcpPacFileFetcherFactory->Create(m_urlRequestContext.get()), host_resolver.get(), nullptr /* NetLog */, |