Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/renderer_host/resource_dispatcher_host.h

 // 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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "content/browser/download/download_resource_handler.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"
 #include "ipc/ipc_message.h"
 #include "net/url_request/url_request.h"
 #include "webkit/glue/resource_type.h"
 
 class DownloadFileManager;
 class ResourceDispatcherHostRequestInfo;
 class ResourceHandler;
@@ skipping 12 matching lines @@
 
 namespace net {
 class CookieList;
 class URLRequestJobFactory;
 }  // namespace net
 
 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();
 
   // Returns the current ResourceDispatcherHost. May return NULL if it hasn't
   // been created yet.
   static ResourceDispatcherHost* Get();
 
   // Puts the resource dispatcher host in an inactive state (unable to begin
   // new requests).  Cancels all pending requests.
@@ skipping 95 matching lines @@
 
   // Force cancels any pending requests for the given route id.  This method
   // acts like CancelRequestsForProcess when route_id is -1.
   void CancelRequestsForRoute(int child_id, int route_id);
 
   // Force cancels any pending requests for the given |context|. This is
   // necessary to ensure that before |context| goes away, all requests
   // for it are dead.
   void CancelRequestsForContext(content::ResourceContext* context);
 
-  // net::URLRequest::Delegate
+  // net::URLRequest::Delegate:
   virtual void OnReceivedRedirect(net::URLRequest* request,
                                   const GURL& new_url,
                                   bool* defer_redirect) OVERRIDE;
   virtual void OnAuthRequired(net::URLRequest* request,
                               net::AuthChallengeInfo* auth_info) OVERRIDE;
   virtual void OnCertificateRequested(
       net::URLRequest* request,
       net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual void OnSSLCertificateError(net::URLRequest* request,
                                      const net::SSLInfo& ssl_info,
@@ skipping 86 matching lines @@
 
   scoped_refptr<ResourceHandler> CreateResourceHandlerForDownload(
       net::URLRequest* request,
       content::ResourceContext* context,
       int child_id,
       int route_id,
       int request_id,
       const DownloadSaveInfo& save_info,
       const DownloadResourceHandler::OnStartedCallback& started_cb);
 
+  // SSLErrorHandler::Delegate:

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

it seems like it would be better to move these functions to be listed just after
the URLRequest::Delegate methods.  that way the functions that are overridden
from base classes are grouped together.

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

I see.
Also I remove their implementation just before static function.
I guess it would be better place from the viewpoints of this.

I also added the same style comments with net::URLRequest::Delegate like, //
SSLErrorHandler::Delegate ---...

+  virtual void CancelSSLRequest(const content::GlobalRequestID& id,
+                                int error,
+                                const net::SSLInfo* ssl_info) OVERRIDE;
+  virtual void ContinueSSLRequest(const content::GlobalRequestID& id) OVERRIDE;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            TestBlockedRequestsProcessDies);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            IncrementOutstandingRequestsMemoryCost);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            CalculateApproximateMemoryCost);
 
   class ShutdownTask;
 
@@ skipping 231 matching lines @@
   // Maps the request ID of request that is being transferred to a new RVH
   // to the respective request.
   typedef std::map<content::GlobalRequestID, net::URLRequest*>
       TransferredNavigations;
   TransferredNavigations transferred_navigations_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_