Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/renderer_host/resource_dispatcher_host_impl.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 1460 matching lines @@
   info->set_ssl_client_auth_handler(
       new SSLClientAuthHandler(request, cert_request_info));
   info->ssl_client_auth_handler()->SelectCertificate();
 }
 
 void ResourceDispatcherHostImpl::OnSSLCertificateError(
     net::URLRequest* request,
     const net::SSLInfo& ssl_info,
     bool is_hsts_host) {
   DCHECK(request);
-  SSLManager::OnSSLCertificateError(request, ssl_info, is_hsts_host);
+  ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
+  DCHECK(info);
+  GlobalRequestID request_id(info->GetChildID(), info->GetRequestID());
+  int render_process_id;
+  int render_view_id;
+  if(!info->GetAssociatedRenderView(&render_process_id, &render_view_id))
+    NOTREACHED();
+  SSLManager::OnSSLCertificateError(this, request_id, info->GetResourceType(),
+      request->url(), render_process_id, render_view_id, ssl_info,
+      is_hsts_host);
 }
 
 void ResourceDispatcherHostImpl::OnResponseStarted(net::URLRequest* request) {
   VLOG(1) << "OnResponseStarted: " << request->url().spec();
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
 
   if (request->status().is_success()) {
     if (PauseRequestIfNeeded(info)) {
       VLOG(1) << "OnResponseStarted pausing: " << request->url().spec();
       return;
@@ skipping 434 matching lines @@
 }
 
 void ResourceDispatcherHostImpl::CallResponseCompleted(int child_id,
                                                        int request_id) {
   PendingRequestList::iterator i = pending_requests_.find(
       GlobalRequestID(child_id, request_id));
   if (i != pending_requests_.end())
     ResponseCompleted(i->second);
 }
 
+// SSLErrorHandler::Delegate ---------------------------------------------------

[darin (slow to review), 2012/03/12 22:10:16]

nit: add a new line below here

[Takashi Toyoshima, 2012/03/12 22:13:18]

Done.

+void ResourceDispatcherHostImpl::CancelSSLRequest(
+    const GlobalRequestID& id,
+    int error,
+    const net::SSLInfo* ssl_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::URLRequest* request = GetURLRequest(id);
+  // The request can be NULL if it was cancelled by the renderer (as the
+  // request of the user navigating to a new page from the location bar).
+  if (!request || !request->is_pending())
+    return;
+  DVLOG(1) << "CancelSSLRequest() url: " << request->url().spec();
+  // TODO(toyoshim): Following method names SimulateSSLError() and
+  // SimulateError() looks inconsistent with other Cancel methods.
+  if (ssl_info)
+    request->SimulateSSLError(error, *ssl_info);
+  else
+    request->SimulateError(error);
+}
+
+void ResourceDispatcherHostImpl::ContinueSSLRequest(
+    const GlobalRequestID& id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::URLRequest* request = GetURLRequest(id);
+  // The request can be NULL if it was cancelled by the renderer (as the
+  // request of the user navigating to a new page from the location bar).
+  if (!request)
+    return;
+  DVLOG(1) << "ContinueSSLRequest() url: " << request->url().spec();
+  request->ContinueDespiteLastError();
+}
+
 void ResourceDispatcherHostImpl::OnUserGesture(TabContents* tab) {
   last_user_gesture_time_ = TimeTicks::Now();
 }
 
 net::URLRequest* ResourceDispatcherHostImpl::GetURLRequest(
     const GlobalRequestID& request_id) const {
   // This should be running in the IO loop.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PendingRequestList::const_iterator i = pending_requests_.find(request_id);
@@ skipping 294 matching lines @@
   return allow_cross_origin_auth_prompt_;
 }
 
 bool ResourceDispatcherHostImpl::IsTransferredNavigation(
     const GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }
 
 }  // namespace content