Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/ssl/ssl_cert_error_handler.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_cert_error_handler.h"
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/ssl/ssl_manager.h"
 #include "content/browser/ssl/ssl_policy.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 
 SSLCertErrorHandler::SSLCertErrorHandler(
-    ResourceDispatcherHost* rdh,
-    net::URLRequest* request,
+    Delegate* delegate,
+    const content::GlobalRequestID& id,
     ResourceType::Type resource_type,
+    const GURL& url,
+    int render_process_id,

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

it actually looks like we only need the render_process_id and render_view_id
inside the Dispatch function.  those could be bound parameters to the Dispatch
function.  they could just be looked up inside
SSLManager::OnSSLCertificateError.

that would mean that you don't need render_process_id_ or render_view_id_.  it
also means that you would have fewer parameters to these constructors.

you could furthermore just pass the URLRequest, which would then mean that you
wouldn't need the GlobalRequestID or the GURL since you can get both of those
from the URLRequest.

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

WebSocket doesn't use URLRequest.
Removing it from SSLManager related codes is one of the major purpose of this
refactoring.

resource_type and url are exported from SSLErrorHandler class. So these could
not be omitted, I think.

+    int render_view_id,
     const net::SSLInfo& ssl_info,
     bool fatal)
-    : SSLErrorHandler(rdh, request, resource_type),
+    : SSLErrorHandler(delegate, id, resource_type, url, render_process_id,
+          render_view_id),
       ssl_info_(ssl_info),
       cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
       fatal_(fatal) {
-  DCHECK(request == resource_dispatcher_host_->GetURLRequest(request_id_));
 }
 
 SSLCertErrorHandler* SSLCertErrorHandler::AsSSLCertErrorHandler() {
   return this;
 }
 
 void SSLCertErrorHandler::OnDispatchFailed() {
   // Requests that don't have a tab (i.e. requests from extensions) will fail
   // to dispatch because they don't have a TabContents. See 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 SSLCertErrorHandler::OnDispatched() {
   manager_->policy()->OnCertError(this);
 }
 
 SSLCertErrorHandler::~SSLCertErrorHandler() {}