Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Unified Diff: content/browser/ssl/ssl_error_handler.cc

Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix incorrectly modified code Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/ssl/ssl_error_handler.cc
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index 218ddeb86fd7b1ec91def5a82f74e99e598c4824..85cb3a4beda5902870de947ea14f0eb83c256f37 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;
« no previous file with comments | « content/browser/renderer_host/media/web_contents_video_capture_device.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698