| 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 1c74bd042000c70c070b1f2e3e60299affa8b5e0..1de7958f66adc9df0cc40879c604c3b078284d32 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[] = {
|
| 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,
|
|
|