diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 6f9f1609db2d..8073affc1ed5 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -354,7 +354,7 @@ template void Session::DoCacheAction(const net::CompletionCallback& callback) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&DoCacheActionInIO, - make_scoped_refptr(browser_context_->url_request_context_getter()), + make_scoped_refptr(browser_context_->GetRequestContext()), action, callback)); } @@ -385,7 +385,7 @@ void Session::FlushStorageData() { void Session::SetProxy(const net::ProxyConfig& config, const base::Closure& callback) { - auto getter = browser_context_->url_request_context_getter(); + auto getter = browser_context_->GetRequestContext(); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&SetProxyInIO, base::Unretained(getter), config, callback)); } @@ -455,14 +455,14 @@ void Session::ClearHostResolverCache(mate::Arguments* args) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&ClearHostResolverCacheInIO, - make_scoped_refptr(browser_context_->url_request_context_getter()), + make_scoped_refptr(browser_context_->GetRequestContext()), callback)); } void Session::AllowNTLMCredentialsForDomains(const std::string& domains) { BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&AllowNTLMCredentialsForDomainsInIO, - make_scoped_refptr(browser_context_->url_request_context_getter()), + make_scoped_refptr(browser_context_->GetRequestContext()), domains)); } @@ -473,7 +473,7 @@ void Session::SetUserAgent(const std::string& user_agent, std::string accept_lang = l10n_util::GetApplicationLocale(""); args->GetNext(&accept_lang); - auto getter = browser_context_->url_request_context_getter(); + auto getter = browser_context_->GetRequestContext(); getter->GetNetworkTaskRunner()->PostTask( FROM_HERE, base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent)); diff --git a/atom/common/native_mate_converters/gfx_converter.cc b/atom/common/native_mate_converters/gfx_converter.cc index 7e0a14930039..db6a181cc96f 100644 --- a/atom/common/native_mate_converters/gfx_converter.cc +++ b/atom/common/native_mate_converters/gfx_converter.cc @@ -36,7 +36,7 @@ bool Converter::FromV8(v8::Isolate* isolate, } v8::Local Converter::ToV8(v8::Isolate* isolate, - const gfx::Size& val) { + const gfx::Size& val) { mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); dict.SetHidden("simple", true); dict.Set("width", val.width()); @@ -97,8 +97,8 @@ struct Converter { } }; -v8::Local Converter::ToV8(v8::Isolate* isolate, - const display::Display& val) { +v8::Local Converter::ToV8( + v8::Isolate* isolate, const display::Display& val) { mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate); dict.SetHidden("simple", true); dict.Set("id", val.id());