Chromium Code Reviews| 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 8bd349af94a657be555d74ee8cc49406a65ab790..fd18ab661371f67dd6eb42be0115fae5d6687907 100644 |
| --- a/android_webview/browser/net/aw_url_request_context_getter.cc |
| +++ b/android_webview/browser/net/aw_url_request_context_getter.cc |
| @@ -58,6 +58,9 @@ namespace android_webview { |
| namespace { |
| +// On apps targeting API level O or later, check cleartext is enforced. |
| +bool g_check_cleartext_permitted = false; |
| + |
| const base::FilePath::CharType kChannelIDFilename[] = "Origin Bound Certs"; |
| const char kProxyServerSwitch[] = "proxy-server"; |
| @@ -262,6 +265,8 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() { |
| builder.set_host_resolver(std::move(host_resolver)); |
| url_request_context_ = builder.Build(); |
| + url_request_context_->set_check_cleartext_permitted( |
| + g_check_cleartext_permitted); |
| job_factory_ = |
| CreateJobFactory(&protocol_handlers_, std::move(request_interceptors_)); |
| @@ -294,6 +299,11 @@ net::NetLog* AwURLRequestContextGetter::GetNetLog() { |
| return net_log_.get(); |
| } |
| +// static |
| +void AwURLRequestContextGetter::set_check_cleartext_permitted(bool permitted) { |
| + g_check_cleartext_permitted = permitted; |
|
boliu
2017/02/03 23:12:37
Please DCHECK that this must be called before any
sgurun-gerrit only
2017/02/04 00:40:29
Done.
|
| +} |
| + |
| std::unique_ptr<net::HttpAuthHandlerFactory> |
| AwURLRequestContextGetter::CreateAuthHandlerFactory( |
| net::HostResolver* resolver) { |