mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

base::WrapUnique has changed its API

Browse source
This commit is contained in:
Cheng Zhao 2017-04-04 15:56:35 +09:00
parent c41fb922b3
commit bbd4749668
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brightray/browser/url_request_context_getter.cc
View file

@ -195,9 +195,8 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
std::unique_ptr<net::CookieStore> cookie_store = std::unique_ptr<net::CookieStore> cookie_store =
content::CreateCookieStore(cookie_config); content::CreateCookieStore(cookie_config);
storage_->set_cookie_store(std::move(cookie_store)); storage_->set_cookie_store(std::move(cookie_store));
storage_->set_channel_id_service(base::WrapUnique( storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), new net::DefaultChannelIDStore(nullptr)));
base::WorkerPool::GetTaskRunner(true))));
std::string accept_lang = l10n_util::GetApplicationLocale(""); std::string accept_lang = l10n_util::GetApplicationLocale("");
storage_->set_http_user_agent_settings(base::WrapUnique( storage_->set_http_user_agent_settings(base::WrapUnique(
@ -354,9 +353,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
it != protocol_interceptors_.rend(); it != protocol_interceptors_.rend();
++it) { ++it) {
top_job_factory.reset(new net::URLRequestInterceptingJobFactory( 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)); storage_->set_job_factory(std::move(top_job_factory));
} }