diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 04:03:50 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 04:03:50 +0000 |
commit | 9a7e150847e8885c1fadd954b870866490956bf0 (patch) | |
tree | a786b0cc4078ad97750f7da3b90a513716eb979c /chrome/browser/ssl | |
parent | 5d9620155824daa9dbd1ea96611241b475b1b167 (diff) | |
download | chromium_src-9a7e150847e8885c1fadd954b870866490956bf0.zip chromium_src-9a7e150847e8885c1fadd954b870866490956bf0.tar.gz chromium_src-9a7e150847e8885c1fadd954b870866490956bf0.tar.bz2 |
Rename ChromeThread to BrowserThread Part6:
- Rename entries under renderer_host and ssl.
BUG=56926
TEST=trybots
Review URL: http://codereview.chromium.org/3595017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r-- | chrome/browser/ssl/ssl_add_cert_handler.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_client_auth_handler.cc | 8 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_client_auth_handler.h | 2 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_error_handler.cc | 34 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 4 |
5 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc index b6430a7..8cb4a8e 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler.cc +++ b/chrome/browser/ssl/ssl_add_cert_handler.cc @@ -27,8 +27,8 @@ SSLAddCertHandler::SSLAddCertHandler(URLRequest* request, // Stay alive until the process completes and Finished() is called. AddRef(); // Delay adding the certificate until the next mainloop iteration. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &SSLAddCertHandler::Run)); } diff --git a/chrome/browser/ssl/ssl_client_auth_handler.cc b/chrome/browser/ssl/ssl_client_auth_handler.cc index 74b25bf..7d5c6a5 100644 --- a/chrome/browser/ssl/ssl_client_auth_handler.cc +++ b/chrome/browser/ssl/ssl_client_auth_handler.cc @@ -27,7 +27,7 @@ void SSLClientAuthHandler::OnRequestCancelled() { } void SSLClientAuthHandler::SelectCertificate() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); int render_process_host_id; int render_view_host_id; @@ -48,14 +48,14 @@ void SSLClientAuthHandler::SelectCertificate() { // Notify the IO thread that we have selected a cert. void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) { - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &SSLClientAuthHandler::DoCertificateSelected, cert)); } void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // request_ could have been NULLed if the request was cancelled while the // user was choosing a cert, or because we have already responded to the // certificate. diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h index de90e5a..852467e 100644 --- a/chrome/browser/ssl/ssl_client_auth_handler.h +++ b/chrome/browser/ssl/ssl_client_auth_handler.h @@ -22,7 +22,7 @@ class URLRequest; // when the URLRequest is cancelled. class SSLClientAuthHandler : public base::RefCountedThreadSafe<SSLClientAuthHandler, - ChromeThread::DeleteOnIOThread> { + BrowserThread::DeleteOnIOThread> { public: SSLClientAuthHandler(URLRequest* request, net::SSLCertRequestInfo* cert_request_info); diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc index e77ab15..52792eb 100644 --- a/chrome/browser/ssl/ssl_error_handler.cc +++ b/chrome/browser/ssl/ssl_error_handler.cc @@ -26,7 +26,7 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh, frame_origin_(frame_origin), main_frame_origin_(main_frame_origin), request_has_been_notified_(false) { - DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); ResourceDispatcherHostRequestInfo* info = ResourceDispatcherHost::InfoForRequest(request); @@ -47,7 +47,7 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh, } void SSLErrorHandler::Dispatch() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); TabContents* tab_contents = GetTabContents(); if (!tab_contents) { @@ -68,46 +68,46 @@ TabContents* SSLErrorHandler::GetTabContents() { } void SSLErrorHandler::CancelRequest() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // We need to complete this task on the IO thread. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &SSLErrorHandler::CompleteCancelRequest, net::ERR_ABORTED)); } void SSLErrorHandler::DenyRequest() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // We need to complete this task on the IO thread. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &SSLErrorHandler::CompleteCancelRequest, net::ERR_INSECURE_RESPONSE)); } void SSLErrorHandler::ContinueRequest() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // We need to complete this task on the IO thread. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &SSLErrorHandler::CompleteContinueRequest)); } void SSLErrorHandler::TakeNoAction() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // We need to complete this task on the IO thread. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &SSLErrorHandler::CompleteTakeNoAction)); } void SSLErrorHandler::CompleteCancelRequest(int error) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // It is important that we notify the URLRequest only once. If we try to // notify the request twice, it may no longer exist and |this| might have @@ -134,7 +134,7 @@ void SSLErrorHandler::CompleteCancelRequest(int error) { } void SSLErrorHandler::CompleteContinueRequest() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // It is important that we notify the URLRequest only once. If we try to // notify the request twice, it may no longer exist and |this| might have @@ -157,7 +157,7 @@ void SSLErrorHandler::CompleteContinueRequest() { } void SSLErrorHandler::CompleteTakeNoAction() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // It is important that we notify the URLRequest only once. If we try to // notify the request twice, it may no longer exist and |this| might have diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index a2a34ab..ee2dd31 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -36,8 +36,8 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, // A certificate error occurred. Construct a SSLCertErrorHandler object and // hand it over to the UI thread for processing. - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(new SSLCertErrorHandler(rdh, request, info->resource_type(), |