From 6c7ad3ac580eb9c9b536f0e0ad3369e26ba8eff7 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Wed, 23 Aug 2017 21:55:46 +0300 Subject: [PATCH] Remove the dependence on BrowserThread::FILE for https://codereview.chromium.org/2944313003 --- atom/browser/atom_access_token_store.cc | 3 +-- atom/browser/net/url_request_fetch_job.cc | 1 - brightray/browser/browser_context.cc | 1 - brightray/browser/url_request_context_getter.cc | 4 +--- brightray/browser/url_request_context_getter.h | 2 -- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/atom/browser/atom_access_token_store.cc b/atom/browser/atom_access_token_store.cc index 6a5597ca7780..86bfd115fbe9 100644 --- a/atom/browser/atom_access_token_store.cc +++ b/atom/browser/atom_access_token_store.cc @@ -29,8 +29,7 @@ class GeoURLRequestContextGetter : public net::URLRequestContextGetter { net::URLRequestContextBuilder builder; builder.set_proxy_config_service( net::ProxyService::CreateSystemProxyConfigService( - BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), - BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); + BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); url_request_context_ = builder.Build(); } return url_request_context_.get(); diff --git a/atom/browser/net/url_request_fetch_job.cc b/atom/browser/net/url_request_fetch_job.cc index 04d0ddd1e6af..2a941711f683 100644 --- a/atom/browser/net/url_request_fetch_job.cc +++ b/atom/browser/net/url_request_fetch_job.cc @@ -98,7 +98,6 @@ void URLRequestFetchJob::BeforeStartInUI( url_request_context_getter_ = new brightray::URLRequestContextGetter( this, nullptr, nullptr, base::FilePath(), true, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), - BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), nullptr, content::URLRequestInterceptorScopedVector()); } else { mate::Handle session; diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index c9e30ff28415..8a1cb32129a3 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -134,7 +134,6 @@ net::URLRequestContextGetter* BrowserContext::CreateRequestContext( GetPath(), in_memory_, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), - BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), protocol_handlers, std::move(protocol_interceptors)); resource_context_->set_url_request_context_getter(url_request_getter_.get()); diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index f9efcb7a547a..09f66fc0d875 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -130,7 +130,6 @@ URLRequestContextGetter::URLRequestContextGetter( const base::FilePath& base_path, bool in_memory, scoped_refptr io_task_runner, - scoped_refptr file_task_runner, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector protocol_interceptors) : delegate_(delegate), @@ -139,7 +138,6 @@ URLRequestContextGetter::URLRequestContextGetter( base_path_(base_path), in_memory_(in_memory), io_task_runner_(io_task_runner), - file_task_runner_(file_task_runner), protocol_interceptors_(std::move(protocol_interceptors)), job_factory_(nullptr) { // Must first be created on the UI thread. @@ -155,7 +153,7 @@ URLRequestContextGetter::URLRequestContextGetter( // must synchronously run on the glib message loop. This will be passed to // the URLRequestContextStorage on the IO thread in GetURLRequestContext(). proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( - io_task_runner_, file_task_runner_); + io_task_runner_); } URLRequestContextGetter::~URLRequestContextGetter() { diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 5db4579d8179..25c775607010 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -66,7 +66,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { const base::FilePath& base_path, bool in_memory, scoped_refptr io_task_runner, - scoped_refptr file_task_runner, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector protocol_interceptors); virtual ~URLRequestContextGetter(); @@ -87,7 +86,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { base::FilePath base_path_; bool in_memory_; scoped_refptr io_task_runner_; - scoped_refptr file_task_runner_; std::string user_agent_;