Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/ssl/ssl_error_handler.h

-// 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.
 
 #ifndef CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 #define CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "content/browser/ssl/ssl_manager.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/resource_type.h"
 
-class ResourceDispatcherHost;
 class SSLCertErrorHandler;
+class SSLManager;
 
 namespace net {
+class SSLInfo;
 class URLRequest;
 }  // namespace net
 
 // An SSLErrorHandler carries information from the IO thread to the UI thread
 // and is dispatched to the appropriate SSLManager when it arrives on the
 // UI thread.  Subclasses should override the OnDispatched/OnDispatchFailed
 // methods to implement the actions that should be taken on the UI thread.
 // These methods can call the different convenience methods ContinueRequest/
 // CancelRequest to perform any required action on the net::URLRequest the
 // ErrorHandler was created with.
 //
 // IMPORTANT NOTE:
 //
 //   If you are not doing anything in OnDispatched/OnDispatchFailed, make sure
 //   you call TakeNoAction().  This is necessary for ensuring the instance is
 //   not leaked.
 //
 class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
  public:
+  // Delegate functions must be called from IO thread. All functions accept
+  // |id| as the first argument. |id| is a copy of the second argument of
+  // SSLManager::OnSSLCertificateError() and represents the request.
+  // Finally, CancelSSLRequest() or ContinueSSLRequest() will be called after
+  // SSLErrorHandler makes a decision on the SSL error.
+  class Delegate {
+   public:
+    // Called when SSLErrorHandler decides to cancel the request because of
+    // the SSL error.
+    virtual void CancelSSLRequest(const content::GlobalRequestID& id,
+                                  int error,
+                                  const net::SSLInfo* ssl_info) = 0;
+
+    // Called when SSLErrorHandler decides to continue the request despite the
+    // SSL error.
+    virtual void ContinueSSLRequest(const content::GlobalRequestID& id) = 0;
+  };

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

nit: add a new line at the end of this class.

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

Done.

   virtual SSLCertErrorHandler* AsSSLCertErrorHandler();
 
   // Find the appropriate SSLManager for the net::URLRequest and begin handling
   // this error.
   //
   // Call on UI thread.
   void Dispatch();
 
   // Available on either thread.
   const GURL& request_url() const { return request_url_; }
@@ skipping 24 matching lines @@
   // call this.
   void TakeNoAction();
 
   int render_process_id() const { return render_process_id_; }
   int render_view_id() const { return render_view_id_; }
 
  protected:
   friend class base::RefCountedThreadSafe<SSLErrorHandler>;
 
   // Construct on the IO thread.
-  SSLErrorHandler(ResourceDispatcherHost* resource_dispatcher_host,
-                  net::URLRequest* request,
-                  ResourceType::Type resource_type);
+  SSLErrorHandler(Delegate* delegate,
+                  const content::GlobalRequestID& id,

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

isn't there redundant information being passed here?  GlobalRequestID has a
process ID member.  is that different than the render_process_id being passed
here?

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

The contents of GlobalRequestID is different from inheritance.
As you said, ResourceDispatcherHost uses process ID, but
SocketStreamDispatcherHost will use socket_id.
This is the reason why I introduce these arguments.

+                  ResourceType::Type resource_type,
+                  const GURL& url,
+                  int render_process_id,
+                  int render_view_id);
 
   virtual ~SSLErrorHandler();
 
   // The following 2 methods are the methods subclasses should implement.
   virtual void OnDispatchFailed();
 
   // Can use the manager_ member.
   virtual void OnDispatched();
 
   // Should only be accessed on the UI thread.
   SSLManager* manager_;  // Our manager.
 
-  // The id of the net::URLRequest associated with this object.
+  // The id of the request associated with this object.
   // Should only be accessed from the IO thread.
   content::GlobalRequestID request_id_;
 
-  // The ResourceDispatcherHost we are associated with.
-  ResourceDispatcherHost* resource_dispatcher_host_;
+  // The delegate we are associated with.
+  Delegate* delegate_;
 
  private:
   // Completes the CancelRequest operation on the IO thread.
   // Call on the IO thread.
   void CompleteCancelRequest(int error);
 
   // Completes the ContinueRequest operation on the IO thread.
   //
   // Call on the IO thread.
   void CompleteContinueRequest();
@@ skipping 17 matching lines @@
   const ResourceType::Type resource_type_;
 
   // A flag to make sure we notify the net::URLRequest exactly once.
   // Should only be accessed on the IO thread
   bool request_has_been_notified_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLErrorHandler);
 };
 
 #endif  // CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_