diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 01:11:25 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 01:11:25 +0000 |
| commit | ea114727620483755ebecf7b3fe4e7f9d50316e4 (patch) | |
| tree | 4731c05242dc6745d2a7e9fb50e1e310470c7138 /content/browser/ssl/ssl_client_auth_handler.cc | |
| parent | 0535866266fe81c93349f9abf0d2e2b87519b3d0 (diff) | |
| download | chromium_src-ea114727620483755ebecf7b3fe4e7f9d50316e4.zip chromium_src-ea114727620483755ebecf7b3fe4e7f9d50316e4.tar.gz chromium_src-ea114727620483755ebecf7b3fe4e7f9d50316e4.tar.bz2 | |
Add content/public/browser/resource_dispatcher_host.h
R=jam@chromium.org
TBR=willchan@chromium.org,mirandac@chromium.org,ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9648020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_client_auth_handler.cc')
| -rw-r--r-- | content/browser/ssl/ssl_client_auth_handler.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 11a43ba..9572d80 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc @@ -5,7 +5,6 @@ #include "content/browser/ssl/ssl_client_auth_handler.h" #include "base/bind.h" -#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_request_info_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -15,6 +14,7 @@ #include "net/url_request/url_request_context.h" using content::BrowserThread; +using content::ResourceRequestInfo; using content::ResourceRequestInfoImpl; SSLClientAuthHandler::SSLClientAuthHandler( @@ -38,12 +38,13 @@ void SSLClientAuthHandler::OnRequestCancelled() { void SSLClientAuthHandler::SelectCertificate() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK(request_); int render_process_host_id; int render_view_host_id; - if (!ResourceDispatcherHost::RenderViewForRequest(request_, - &render_process_host_id, - &render_view_host_id)) + if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView( + &render_process_host_id, + &render_view_host_id)) NOTREACHED(); // If the RVH does not exist by the time this task gets run, then the task @@ -78,7 +79,7 @@ void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) { request_->ContinueWithCertificate(cert); ResourceRequestInfoImpl* info = - ResourceDispatcherHost::InfoForRequest(request_); + ResourceRequestInfoImpl::ForRequest(request_); if (info) info->set_ssl_client_auth_handler(NULL); |