Make SSLErrorHandler UI-thread-only and not-refcounted

content/browser/ssl/ssl_error_handler.cc

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 11e68910bde8bdab8691807caa155311d91245ff..1bf03a236107bce58cb895378812b0de2ea5b61d 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -7,8 +7,6 @@
 #include "base/bind.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
-#include "content/browser/ssl/ssl_manager.h"
-#include "content/browser/ssl/ssl_policy.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
@@ -20,161 +18,63 @@ using net::SSLInfo;
 
 namespace content {
 
-SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
+namespace {
+
+void CompleteCancelRequest(
+    const base::WeakPtr<SSLErrorHandler::Delegate>& delegate,
+    const net::SSLInfo& ssl_info,
+    int error) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (delegate.get())
+    delegate->CancelSSLRequest(error, &ssl_info);
+}
+
+void CompleteContinueRequest(
+    const base::WeakPtr<SSLErrorHandler::Delegate>& delegate) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (delegate.get()) {
+    delegate->ContinueSSLRequest();
+  }
+}
+
+}  // namespace
+
+SSLErrorHandler::SSLErrorHandler(WebContents* web_contents,
+                                 const base::WeakPtr<Delegate>& delegate,
                                  ResourceType resource_type,
                                  const GURL& url,
                                  const net::SSLInfo& ssl_info,
                                  bool fatal)
-    : manager_(NULL),
-      delegate_(delegate),
-      request_has_been_notified_(false),
+    : delegate_(delegate),
       request_url_(url),
       resource_type_(resource_type),
       ssl_info_(ssl_info),
       cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
-      fatal_(fatal) {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(delegate.get());
-
-  // This makes sure we don't disappear on the IO thread until we've given an
-  // answer to the net::URLRequest.
-  //
-  // Release in CompleteCancelRequest, CompleteContinueRequest, or
-  // CompleteTakeNoAction.
-  AddRef();
+      fatal_(fatal),
+      web_contents_(web_contents) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 SSLErrorHandler::~SSLErrorHandler() {}
 
-void SSLErrorHandler::OnDispatchFailed() {
-  // Requests can fail to dispatch because they don't have a WebContents. See
-  // <http://crbug.com/86537>. In this case we have to make a decision in this
-  // function, so we ignore revocation check failures.
-  if (net::IsCertStatusMinorError(ssl_info().cert_status)) {
-    ContinueRequest();
-  } else {
-    CancelRequest();
-  }
-}
-
-void SSLErrorHandler::OnDispatched() {
-  manager_->policy()->OnCertError(this);
-}
-
-void SSLErrorHandler::Dispatch(
-    const base::Callback<WebContents*(void)>& web_contents_getter) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  WebContents* web_contents = web_contents_getter.Run();
-
-  if (!web_contents) {
-    // We arrived on the UI thread, but the tab we're looking for is no longer
-    // here.
-    OnDispatchFailed();
-    return;
-  }
-
-  // Hand ourselves off to the SSLManager.
-  manager_ =
-      static_cast<NavigationControllerImpl*>(&web_contents->GetController())->
-          ssl_manager();
-  OnDispatched();
-}
-
 void SSLErrorHandler::CancelRequest() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // We need to complete this task on the IO thread.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-          &SSLErrorHandler::CompleteCancelRequest, this, net::ERR_ABORTED));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&CompleteCancelRequest, delegate_,
+                                     ssl_info(), net::ERR_ABORTED));
 }
 
 void SSLErrorHandler::DenyRequest() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // We need to complete this task on the IO thread.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-          &SSLErrorHandler::CompleteCancelRequest, this,
-          net::ERR_INSECURE_RESPONSE));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&CompleteCancelRequest, delegate_,
+                                     ssl_info(), net::ERR_INSECURE_RESPONSE));
 }
 
 void SSLErrorHandler::ContinueRequest() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // We need to complete this task on the IO thread.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&SSLErrorHandler::CompleteContinueRequest, this));
-}
-
-void SSLErrorHandler::TakeNoAction() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // We need to complete this task on the IO thread.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&SSLErrorHandler::CompleteTakeNoAction, this));
-}
-
-SSLManager* SSLErrorHandler::GetManager() const {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return manager_;
-}
-
-void SSLErrorHandler::CompleteCancelRequest(int error) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  // It is important that we notify the net::URLRequest only once.  If we try
-  // to notify the request twice, it may no longer exist and |this| might have
-  // already have been deleted.
-  DCHECK(!request_has_been_notified_);
-  if (request_has_been_notified_)
-    return;
-
-  if (delegate_.get())
-    delegate_->CancelSSLRequest(error, &ssl_info_);
-  request_has_been_notified_ = true;
-
-  // We're done with this object on the IO thread.
-  Release();
-}
-
-void SSLErrorHandler::CompleteContinueRequest() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  // It is important that we notify the net::URLRequest only once. If we try to
-  // notify the request twice, it may no longer exist and |this| might have
-  // already have been deleted.
-  DCHECK(!request_has_been_notified_);
-  if (request_has_been_notified_)
-    return;
-
-  if (delegate_.get())
-    delegate_->ContinueSSLRequest();
-  request_has_been_notified_ = true;
-
-  // We're done with this object on the IO thread.
-  Release();
-}
-
-void SSLErrorHandler::CompleteTakeNoAction() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  // It is important that we notify the net::URLRequest only once. If we try to
-  // notify the request twice, it may no longer exist and |this| might have
-  // already have been deleted.
-  DCHECK(!request_has_been_notified_);
-  if (request_has_been_notified_)
-    return;
-
-  request_has_been_notified_ = true;
-
-  // We're done with this object on the IO thread.
-  Release();
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&CompleteContinueRequest, delegate_));
 }
 
 }  // namespace content