Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/renderer_host/resource_dispatcher_host.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.h"
 
 #include <set>
 #include <vector>
@@ skipping 362 matching lines @@
     delegate_->DownloadStarting(request, context, child_id, route_id,
                                 request_id, !request->is_pending(), &throttles);
     if (!throttles.empty()) {
       handler = new ThrottlingResourceHandler(this, handler, child_id,
                                               request_id, throttles.Pass());
     }
   }
   return handler;
 }
 
+ResourceType::Type ResourceDispatcherHost::ResourceTypeForSSLRequest(
+    const GlobalRequestID& id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::URLRequest* request = GetURLRequest(id);
+  DCHECK(request);
+  ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
+  DCHECK(info);
+  return info->resource_type();
+}
+
+const GURL& ResourceDispatcherHost::URLForSSLRequest(
+    const GlobalRequestID& id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::URLRequest* request = GetURLRequest(id);
+  DCHECK(request);
+  return request->url();
+}
+
+bool ResourceDispatcherHost::RenderViewForSSLRequest(
+    const GlobalRequestID& id,
+    int* render_process_host_id,
+    int* render_view_host_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  return RenderViewForRequest(
+      GetURLRequest(id), render_process_host_id, render_view_host_id);
+}
+
+void ResourceDispatcherHost::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())

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

NOTE:  The request switches to no longer being pending at the same time as it is
removed from the pending_requests_ list maintained by the
ResourceDispatcherHost.  This means that testing for GetURLRequest returning
NULL should be sufficient here.  The extra is_pending check should only return
false for requests that have not yet been started.

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

Can I keep this as is for now?
Do you mean pending_requests management will be fixed in a future CL so that the
request gotten from GetURLRequest() always returns true here?

+    return;
+  DVLOG(1) << "CancelRequestForInstance() url: " << request->url().spec();
+  if (ssl_info)
+    request->SimulateSSLError(error, *ssl_info);
+  else
+    request->SimulateError(error);
+}
+
+void ResourceDispatcherHost::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) << "ContinueRequestForInstance() url: " << request->url().spec();
+  request->ContinueDespiteLastError();
+}
+
 void ResourceDispatcherHost::SetRequestInfo(
     net::URLRequest* request,
     ResourceDispatcherHostRequestInfo* info) {
   request->SetUserData(NULL, info);
 }
 
 void ResourceDispatcherHost::OnShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   is_shutdown_ = true;
   for (PendingRequestList::const_iterator i = pending_requests_.begin();
@@ skipping 1020 matching lines @@
   info->set_ssl_client_auth_handler(
       new SSLClientAuthHandler(request, cert_request_info));
   info->ssl_client_auth_handler()->SelectCertificate();
 }
 
 void ResourceDispatcherHost::OnSSLCertificateError(
     net::URLRequest* request,
     const net::SSLInfo& ssl_info,
     bool is_hsts_host) {
   DCHECK(request);
-  SSLManager::OnSSLCertificateError(this, request, ssl_info, is_hsts_host);
+  ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
+  DCHECK(info);
+  GlobalRequestID request_id(info->child_id(), info->request_id());
+  SSLManager::OnSSLCertificateError(this, request_id, ssl_info, is_hsts_host);
 }
 
 bool ResourceDispatcherHost::CanGetCookies(
     const net::URLRequest* request,
     const net::CookieList& cookie_list) const {
   VLOG(1) << "OnGetCookies: " << request->url().spec();
   int render_process_id, render_view_id;
   if (!RenderViewForRequest(request, &render_process_id, &render_view_id))
     return false;
 
@@ skipping 849 matching lines @@
   scoped_refptr<ResourceHandler> transferred_resource_handler(
       new DoomedResourceHandler(info->resource_handler()));
   info->set_resource_handler(transferred_resource_handler.get());
 }
 
 bool ResourceDispatcherHost::IsTransferredNavigation(
     const content::GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }