Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/ssl/ssl_error_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/ssl/ssl_error_handler.h"
 
 #include "base/bind.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::WebContents;
+using net::SSLInfo;
 
-SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
-                                 net::URLRequest* request,
-                                 ResourceType::Type resource_type)
+SSLErrorHandler::SSLErrorHandler(Delegate* delegate,
+                                 const content::GlobalRequestID& id)
     : manager_(NULL),
-      request_id_(0, 0),
-      resource_dispatcher_host_(rdh),
-      request_url_(request->url()),
-      resource_type_(resource_type),
+      request_id_(id),
+      delegate_(delegate),
+      request_url_(delegate->URLForSSLRequest(id)),

[darin (slow to review), 2012/02/28 23:36:44]

why are these delegate function calls instead of just being constructor
parameters?

[Takashi Toyoshima, 2012/02/29 00:15:24]

I thought minimizing number of arguments would be better.
But, just passing them as parameters will be simple.
OK, I'll do so.

+      resource_type_(delegate->ResourceTypeForSSLRequest(id)),
       request_has_been_notified_(false) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(delegate);
 
-  ResourceDispatcherHostRequestInfo* info =
-      ResourceDispatcherHost::InfoForRequest(request);
-  request_id_.child_id = info->child_id();
-  request_id_.request_id = info->request_id();
-
-  if (!ResourceDispatcherHost::RenderViewForRequest(request,
-                                                    &render_process_id_,
-                                                    &render_view_id_))
+  if (!delegate->RenderViewForSSLRequest(
+      id, &render_process_id_, &render_view_id_))
     NOTREACHED();
 
   // 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();
 }
 
@@ skipping 76 matching lines @@
 void SSLErrorHandler::CompleteCancelRequest(int error) {
   DCHECK(BrowserThread::CurrentlyOn(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;
 
-  net::URLRequest* request =
-      resource_dispatcher_host_->GetURLRequest(request_id_);
-  if (request && request->is_pending()) {
-    // The request can be NULL if it was cancelled by the renderer (as the
-    // result of the user navigating to a new page from the location bar).
-    DVLOG(1) << "CompleteCancelRequest() url: " << request->url().spec();
-    SSLCertErrorHandler* cert_error = AsSSLCertErrorHandler();
-    if (cert_error)
-      request->SimulateSSLError(error, cert_error->ssl_info());
-    else
-      request->SimulateError(error);
-  }
+  SSLCertErrorHandler* cert_error = AsSSLCertErrorHandler();
+  const SSLInfo* ssl_info = NULL;
+  if (cert_error)
+    ssl_info = &cert_error->ssl_info();
+  delegate_->CancelSSLRequest(request_id_, error, ssl_info);
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteContinueRequest() {
   DCHECK(BrowserThread::CurrentlyOn(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;
 
-  net::URLRequest* request =
-      resource_dispatcher_host_->GetURLRequest(request_id_);
-  if (request) {
-    // The request can be NULL if it was cancelled by the renderer (as the
-    // result of the user navigating to a new page from the location bar).
-    DVLOG(1) << "CompleteContinueRequest() url: " << request->url().spec();
-    request->ContinueDespiteLastError();
-  }
+  delegate_->ContinueSSLRequest(request_id_);
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteTakeNoAction() {
   DCHECK(BrowserThread::CurrentlyOn(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();
 }