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;
 }
 
+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())
+    return;
+  DVLOG(1) << "CancelRequestForInstance() url: " << request->url().spec();

[darin (slow to review), 2012/03/09 20:49:03]

nit: the log comment seems to implicate a function named
CancelRequestForInstance.  maybe you meant for this to say "CancelSSLRequest"?

[Takashi Toyoshima, 2012/03/10 00:24:44]

Oops, sorry for mistakes.
Fixed.

+  if (ssl_info)
+    request->SimulateSSLError(error, *ssl_info);

[darin (slow to review), 2012/03/09 20:49:03]

the ResourceDispatcherHost has so many other Cancel methods.  it is not clear
why this is implemented using Simulate*Error instead of one of the other Cancel
methods.  Maybe that indicates that this function is even mis-named?  Should it
be named InterruptSSLRequestWithError?

[Takashi Toyoshima, 2012/03/10 00:24:44]

I'm looking into url_request.h.
It has Start(), Cancel(), SimulateError(), SimulateSSLError() methods.
I feel Start(), Cancel(), CancelWithError(), CancelWithSSLError() looks
consistent.

Anyway, I notice that SimulateError() is used from some other files.
I feel it's better that this renaming CL is splited into another CL.
Could you allow me to split it into another CL with a TODO comment?

+  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();

[Takashi Toyoshima, 2012/03/10 00:24:44]

Same mistake here.
Done.

+  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());
+  int render_process_id;
+  int render_view_id;
+  if(!RenderViewForRequest(request, &render_process_id, &render_view_id))

[darin (slow to review), 2012/03/09 20:49:03]

since you already have |info|, please just use the GetAssociatedRenderView
function instead.  RenderViewForRequest has to lookup the info all over again,
which is a bit wasteful.

[Takashi Toyoshima, 2012/03/10 00:24:44]

Applied with rebase.
Done.

+    NOTREACHED();
+  SSLManager::OnSSLCertificateError(this, request_id, info->resource_type(),
+      request->url(), render_process_id, render_view_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();
 }