ios/crnet/crnet_environment.mm - Issue 1888963004: Add HttpProtocolHandler and convert everything to use it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1888963004: Add HttpProtocolHandler and convert everything to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-supports-scheme

Patch Set: more addressing comments Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc ('K') | « ios/chrome/browser/ios_chrome_io_thread.mm ('k') | ios/web/shell/shell_url_request_context_getter.mm » ('j') | net/url_request/http_protocol_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/crnet/crnet_environment.mm

diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm

index b564111b6094572c861928c7b957db95a43e6b0a..eb65b08690b7e66dc860807973b654ac8e136ec7 100644

--- a/ios/crnet/crnet_environment.mm

+++ b/ios/crnet/crnet_environment.mm

@@ -469,14 +469,15 @@ void CrNetEnvironment::InitializeOnNetworkThread() {

[NSHTTPCookieStorage sharedHTTPCookieStorage]);

main_context_->set_cookie_store(cookie_store_.get());

- net::URLRequestJobFactoryImpl* job_factory =

- new net::URLRequestJobFactoryImpl;

+ // TODO(mgersh): Fix this leak too. See https://crbug.com/523858

+ std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory =

+ net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers();

job_factory->SetProtocolHandler(

"data", base::WrapUnique(new net::DataProtocolHandler));

job_factory->SetProtocolHandler(

"file", base::WrapUnique(

new net::FileProtocolHandler(file_thread_->task_runner())));

- main_context_->set_job_factory(job_factory);

+ main_context_->set_job_factory(job_factory.release());

main_context_->set_net_log(net_log_.get());

}