diff options
| author | davidben <davidben@chromium.org> | 2014-12-08 09:55:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-08 17:55:35 +0000 |
| commit | 5b6ba9036b9583fcc0396d60eb441d92bead97ed (patch) | |
| tree | 6a048f64e655f41e636c7f327ac171f1c433c9fd /android_webview | |
| parent | 5f97f68bc038393ce05cdb9bd7aa145c01b69027 (diff) | |
| download | chromium_src-5b6ba9036b9583fcc0396d60eb441d92bead97ed.zip chromium_src-5b6ba9036b9583fcc0396d60eb441d92bead97ed.tar.gz chromium_src-5b6ba9036b9583fcc0396d60eb441d92bead97ed.tar.bz2 | |
Don't key client auth on HttpNetworkSession.
It's an IO-thread object being maintained (fortunately just as a pointer) on
the UI thread. It's used to tie together SSLClientAuthObserver instances, but
the BrowserContext is a more suitable UI thread key.
This relands part of https://codereview.chromium.org/596873002
BUG=439134
Review URL: https://codereview.chromium.org/780383002
Cr-Commit-Position: refs/heads/master@{#307274}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 1 | ||||
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index f5cb5cf..8af695f 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -364,7 +364,6 @@ void AwContentBrowserClient::AllowCertificateError( void AwContentBrowserClient::SelectClientCertificate( int render_process_id, int render_frame_id, - const net::HttpNetworkSession* network_session, net::SSLCertRequestInfo* cert_request_info, const base::Callback<void(net::X509Certificate*)>& callback) { AwContentsClientBridgeBase* client = diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index 1d0bcea..f9507a6 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -106,7 +106,6 @@ class AwContentBrowserClient : public content::ContentBrowserClient { virtual void SelectClientCertificate( int render_process_id, int render_frame_id, - const net::HttpNetworkSession* network_session, net::SSLCertRequestInfo* cert_request_info, const base::Callback<void(net::X509Certificate*)>& callback) override; virtual void RequestPermission( |