diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 21:25:01 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 21:25:01 +0000 |
| commit | c679b2a84dc18146be677df48fd062cb2cf2a3c0 (patch) | |
| tree | 4cedbf2611ae0315543da0e1949089d272e3d4fa /content/browser/ssl | |
| parent | 517370b4d6d2a1bbd753c7bd8d608109681c7619 (diff) | |
| download | chromium_src-c679b2a84dc18146be677df48fd062cb2cf2a3c0.zip chromium_src-c679b2a84dc18146be677df48fd062cb2cf2a3c0.tar.gz chromium_src-c679b2a84dc18146be677df48fd062cb2cf2a3c0.tar.bz2 | |
Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*"
BUG=245942
R=avi@chromium.org
Review URL: https://codereview.chromium.org/16256018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
| -rw-r--r-- | content/browser/ssl/ssl_error_handler.cc | 6 | ||||
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc index 218ddeb..85cb3a4 100644 --- a/content/browser/ssl/ssl_error_handler.cc +++ b/content/browser/ssl/ssl_error_handler.cc @@ -33,7 +33,7 @@ SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate, resource_type_(resource_type), request_has_been_notified_(false) { DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); - DCHECK(delegate); + DCHECK(delegate.get()); // This makes sure we don't disappear on the IO thread until we've given an // answer to the net::URLRequest. @@ -133,7 +133,7 @@ void SSLErrorHandler::CompleteCancelRequest(int error) { const SSLInfo* ssl_info = NULL; if (cert_error) ssl_info = &cert_error->ssl_info(); - if (delegate_) + if (delegate_.get()) delegate_->CancelSSLRequest(request_id_, error, ssl_info); request_has_been_notified_ = true; @@ -151,7 +151,7 @@ void SSLErrorHandler::CompleteContinueRequest() { if (request_has_been_notified_) return; - if (delegate_) + if (delegate_.get()) delegate_->ContinueSSLRequest(request_id_); request_has_been_notified_ = true; diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index 18c64c8..e24bdd1 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -58,14 +58,12 @@ void SSLManager::OnSSLCertificateError( int render_view_id, const net::SSLInfo& ssl_info, bool fatal) { - DCHECK(delegate); + DCHECK(delegate.get()); DVLOG(1) << "OnSSLCertificateError() cert_error: " - << net::MapCertStatusToNetError(ssl_info.cert_status) - << " id: " << id.child_id << "," << id.request_id - << " resource_type: " << resource_type - << " url: " << url.spec() - << " render_process_id: " << render_process_id - << " render_view_id: " << render_view_id + << net::MapCertStatusToNetError(ssl_info.cert_status) << " id: " + << id.child_id << "," << id.request_id << " resource_type: " + << resource_type << " url: " << url.spec() << " render_process_id: " + << render_process_id << " render_view_id: " << render_view_id << " cert_status: " << std::hex << ssl_info.cert_status; // A certificate error occurred. Construct a SSLCertErrorHandler object and |