From bbd474966884c4eb998e43c8ff8db32d619b99f6 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 4 Apr 2017 15:56:35 +0900 Subject: [PATCH] base::WrapUnique has changed its API --- brightray/browser/url_request_context_getter.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index a9e0a22756b1..2e483d62ae5f 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -195,9 +195,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { std::unique_ptr cookie_store = content::CreateCookieStore(cookie_config); storage_->set_cookie_store(std::move(cookie_store)); - storage_->set_channel_id_service(base::WrapUnique( - new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), - base::WorkerPool::GetTaskRunner(true)))); + storage_->set_channel_id_service(base::MakeUnique( + new net::DefaultChannelIDStore(nullptr))); std::string accept_lang = l10n_util::GetApplicationLocale(""); storage_->set_http_user_agent_settings(base::WrapUnique( @@ -354,9 +353,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { it != protocol_interceptors_.rend(); ++it) { top_job_factory.reset(new net::URLRequestInterceptingJobFactory( - std::move(top_job_factory), base::WrapUnique(*it))); + std::move(top_job_factory), std::move(*it))); } - protocol_interceptors_.weak_clear(); + protocol_interceptors_.clear(); storage_->set_job_factory(std::move(top_job_factory)); }