Add a WebContents getter callback in ResourceRequestInfo

content/browser/ssl/ssl_error_handler.h

Index: content/browser/ssl/ssl_error_handler.h
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h
index 26fc147c3f4e8d465661b152d4674dfef0d4f39b..6c517011c09e4ce198eb578495349b0defd287d8 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/content/browser/ssl/ssl_error_handler.h
@@ -25,6 +25,7 @@ namespace content {
 class ResourceDispatcherHostImpl;
 class SSLCertErrorHandler;
 class SSLManager;
+class WebContents;
 
 // An SSLErrorHandler carries information from the IO thread to the UI thread
 // and is dispatched to the appropriate SSLManager when it arrives on the
@@ -65,7 +66,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // this error.
   //
   // Call on UI thread.
-  void Dispatch();
+  void Dispatch(const base::Callback<WebContents*(void)>& web_contents_getter);
 
   // Available on either thread.
   const GURL& request_url() const { return request_url_; }
@@ -96,8 +97,9 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // call this.
   void TakeNoAction();
 
-  int render_process_id() const { return render_process_id_; }
-  int render_frame_id() const { return render_frame_id_; }
+  // Returns the manager associated with this SSLErrorHandler.
+  // Should only be accessed on the UI thread.

[nasko, 2015/11/23 17:00:24]

Why not DCHECK the thread?

[clamy, 2015/11/23 17:56:53]

Done. I moved the implementation to the .cc file, since I'm not sure of the cost
of the DCHECK.

+  SSLManager* manager() const { return manager_; }
 
  protected:
   friend class base::RefCountedThreadSafe<SSLErrorHandler>;
@@ -105,9 +107,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // Construct on the IO thread.
   SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
                   ResourceType resource_type,
-                  const GURL& url,
-                  int render_process_id,
-                  int render_frame_id);
+                  const GURL& url);
 
   virtual ~SSLErrorHandler();
 
@@ -137,11 +137,6 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // Call on the IO thread.
   void CompleteTakeNoAction();
 
-  // We use these members to find the correct SSLManager when we arrive on
-  // the UI thread.
-  int render_process_id_;
-  int render_frame_id_;
-
   // The URL that we requested.
   // This read-only member can be accessed on any thread.
   const GURL request_url_;