Index: android_webview/browser/net/aw_url_request_context_getter.cc |
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc |
index 33f92a68b473594336f387d88c2e6274d4233c89..55c17d4ee9cb0ceb77d9b12197911666104d5b77 100644 |
--- a/android_webview/browser/net/aw_url_request_context_getter.cc |
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc |
@@ -121,23 +121,18 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory( |
DCHECK(set_protocol); |
set_protocol = aw_job_factory->SetProtocolHandler( |
url::kDataScheme, new net::DataProtocolHandler()); |
- DCHECK(set_protocol); |
- set_protocol = aw_job_factory->SetProtocolHandler( |
+ static const char* protocol_handlers_to_copy[] = { |
jbroman
2014/11/14 18:46:35
I'm not sure why android_webview whitelists protoc
|
url::kBlobScheme, |
- (*protocol_handlers)[url::kBlobScheme].release()); |
- DCHECK(set_protocol); |
- set_protocol = aw_job_factory->SetProtocolHandler( |
url::kFileSystemScheme, |
- (*protocol_handlers)[url::kFileSystemScheme].release()); |
- DCHECK(set_protocol); |
- set_protocol = aw_job_factory->SetProtocolHandler( |
content::kChromeUIScheme, |
- (*protocol_handlers)[content::kChromeUIScheme].release()); |
- DCHECK(set_protocol); |
- set_protocol = aw_job_factory->SetProtocolHandler( |
content::kChromeDevToolsScheme, |
- (*protocol_handlers)[content::kChromeDevToolsScheme].release()); |
- DCHECK(set_protocol); |
+ content::kResourceScheme, |
+ }; |
+ for (const char* scheme : protocol_handlers_to_copy) { |
+ set_protocol = aw_job_factory->SetProtocolHandler( |
+ scheme, (*protocol_handlers)[scheme].release()); |
+ DCHECK(set_protocol); |
+ } |
protocol_handlers->clear(); |
// Note that even though the content:// scheme handler is created here, |