From bffd87c118c97447d066c2d469bce6de14bf5e00 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 21 Sep 2016 10:16:05 -0700 Subject: [PATCH] Call AddLogs through unique pointer --- brightray/browser/url_request_context_getter.cc | 7 +++---- brightray/browser/url_request_context_getter.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index cbb9b1a10e7a..45daf0e4aebd 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -25,7 +25,6 @@ #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/cookies/cookie_monster.h" #include "net/dns/mapped_host_resolver.h" #include "net/http/http_auth_filter.h" @@ -278,9 +277,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { new net::HttpServerPropertiesImpl); storage_->set_http_server_properties(std::move(server_properties)); - auto multi_log_ct_verifier = new net::MultiLogCTVerifier(); - multi_log_ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); - cert_transparency_verifier_.reset(multi_log_ct_verifier); + cert_transparency_verifier_.reset(new net::MultiLogCTVerifier()); + cert_transparency_verifier_->AddLogs( + net::ct::CreateLogVerifiersForKnownLogs()); ct_policy_enforcer_.reset(new net::CTPolicyEnforcer()); net::HttpNetworkSession::Params network_session_params; diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 31427d0ccdb8..37c9abb06745 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -8,6 +8,7 @@ #include "base/files/file_path.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" +#include "net/cert/multi_log_ct_verifier.h" #include "net/http/http_cache.h" #include "net/http/url_security_manager.h" #include "net/url_request/url_request_context_getter.h" @@ -88,7 +89,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { std::unique_ptr host_mapping_rules_; std::unique_ptr http_auth_preferences_; std::unique_ptr http_network_session_; - std::unique_ptr cert_transparency_verifier_; + std::unique_ptr cert_transparency_verifier_; std::unique_ptr ct_policy_enforcer_; content::ProtocolHandlerMap protocol_handlers_; content::URLRequestInterceptorScopedVector protocol_interceptors_;