Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/renderer_host/resource_dispatcher_host.h

Index: content/browser/renderer_host/resource_dispatcher_host.h
diff --git a/content/browser/renderer_host/resource_dispatcher_host.h b/content/browser/renderer_host/resource_dispatcher_host.h
index 80c9337e56944db5f1f14957f981e2176ea32b32..15dbc0cf29754146470edb13bef2016aea68f72b 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.h
+++ b/content/browser/renderer_host/resource_dispatcher_host.h
@@ -25,6 +25,7 @@
 #include "base/timer.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/renderer_host/resource_queue.h"
+#include "content/browser/ssl/ssl_error_handler.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_types.h"
@@ -57,7 +58,9 @@ namespace webkit_blob {
 class DeletableFileReference;
 }
 
-class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate {
+class CONTENT_EXPORT ResourceDispatcherHost
+    : public net::URLRequest::Delegate,
+      public SSLErrorHandler::Delegate {
  public:
   ResourceDispatcherHost();
   virtual ~ResourceDispatcherHost();
@@ -219,6 +222,10 @@ class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate {
   net::URLRequest* GetURLRequest(
       const content::GlobalRequestID& request_id) const;
 
+  // Retrieves a net::URLRequest.  Must be called from the IO thread.
+  net::URLRequest* GetURLRequest(
+      const SSLErrorHandler::instance_id& id) const;

[wtc, 2012/02/22 00:36:23]

It seems that this new method can be private.

This is function overloading.  Please make sure this case is
allowed by the Style Guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Overl...

or rename this function to describe its argument
(e.g., GetURLRequestFromSSLErrorHandler).

[Takashi Toyoshima, 2012/02/22 08:15:35]

I can remove this function now, because I decide to stick using
content::GlobalRequestID as a unique ID.

+
   void RemovePendingRequest(int child_id, int request_id);
 
   // Causes all new requests for the route identified by
@@ -284,6 +291,24 @@ class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate {
       const DownloadSaveInfo& save_info,
       const DownloadResourceHandler::OnStartedCallback& started_cb);
 
+  // SSLErrorHandler::Delegate
+  virtual ResourceType::Type ResourceTypeForInstance(
+      const SSLErrorHandler::instance_id& id) OVERRIDE;
+
+  virtual const GURL& URLForInstance(
+      const SSLErrorHandler::instance_id& id) OVERRIDE;
+
+  virtual bool RenderViewForInstance(const SSLErrorHandler::instance_id& id,
+                                     int* render_process_host_id,
+                                     int* render_view_host_id) OVERRIDE;
+
+  virtual void CancelRequestForInstance(const SSLErrorHandler::instance_id& id,
+                                        int error,
+                                        const net::SSLInfo* ssl_info) OVERRIDE;
+
+  virtual void ContinueRequestForInstance(
+      const SSLErrorHandler::instance_id& id) OVERRIDE;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            TestBlockedRequestsProcessDies);