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,
-    ResourceType::Type resource_type,
+    Delegate* delegate,
+    const content::GlobalRequestID& id,

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

So GlobalRequestID is being used to track both URLRequests and WebSockets?

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

Yes.
WebSockets require one int value, socket_id_ to identify requestor object. I'll
also use GlobalRequestID to wrap socket_id_ for WebSockets.

     const net::SSLInfo& ssl_info,
     bool fatal)
-    : SSLErrorHandler(rdh, request, resource_type),
+    : SSLErrorHandler(delegate, 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() {}