Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/ssl/ssl_manager.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_manager.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/load_from_memory_cache_details.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/resource_request_details.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
+#include "content/browser/ssl/ssl_error_handler.h"

[wtc, 2012/02/24 00:44:38]

Nit: this is already included by ssl_manager.h.

[Takashi Toyoshima, 2012/02/28 20:55:43]

Done.

 #include "content/browser/ssl/ssl_policy.h"
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/ssl_status.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 using content::SSLStatus;
 using content::WebContents;
 
 // static
-void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
-                                       net::URLRequest* request,
+void SSLManager::OnSSLCertificateError(SSLErrorHandler::Delegate* delegate,
+                                       const content::GlobalRequestID& id,
                                        const net::SSLInfo& ssl_info,
                                        bool fatal) {
+  DCHECK(delegate);
   DVLOG(1) << "OnSSLCertificateError() cert_error: "
            << net::MapCertStatusToNetError(ssl_info.cert_status)
-           << " url: " << request->url().spec()
+           << " instance_id: " << id.child_id << "," << id.request_id

[wtc, 2012/02/24 00:44:38]

Nit: update "instance_id" in this comment.  Perhaps
"request id" or just "id"?

[Takashi Toyoshima, 2012/02/28 20:55:43]

Done.

+           << " url: " << delegate->URLForSSLRequest(id)
            << " cert_status: " << std::hex << ssl_info.cert_status;
 
-  ResourceDispatcherHostRequestInfo* info =
-      ResourceDispatcherHost::InfoForRequest(request);
-
   // A certificate error occurred.  Construct a SSLCertErrorHandler object and
   // hand it over to the UI thread for processing.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SSLCertErrorHandler::Dispatch,
-                 new SSLCertErrorHandler(rdh,
-                                         request,
-                                         info->resource_type(),
+                 new SSLCertErrorHandler(delegate,
+                                         id,
                                          ssl_info,
                                          fatal)));
 }
 
 // static
 void SSLManager::NotifySSLInternalStateChanged(
     NavigationControllerImpl* controller) {
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
       content::Source<content::BrowserContext>(controller->GetBrowserContext()),
@@ skipping 149 matching lines @@
 
   policy()->UpdateEntry(entry, controller_->tab_contents());
 
   if (!entry->GetSSL().Equals(original_ssl_status)) {
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
         content::Source<NavigationController>(controller_),
         content::NotificationService::NoDetails());
   }
 }