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..7f9f68ea812dbe86b5c88c5c4d7a6d7931e5da93 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/content/browser/ssl/ssl_error_handler.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/common/resource_type.h"
 #include "url/gurl.h"
 
@@ -96,18 +97,20 @@ 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_; }
+  const ResourceRequestInfo::WebContentsGetterOnUI& web_contents_getter()
+      const {
+    return web_contents_getter_;
+  }
 
  protected:
   friend class base::RefCountedThreadSafe<SSLErrorHandler>;
 
   // Construct on the IO thread.

[davidben, 2015/11/19 17:46:13]

Really we should make this class UI thread only. (That might be better as a
follow-up? I can do that after this lands perhaps.)

In the meantime, perhaps if WebContentsGetterOnUI were moved to a parameter of
Dispatch? I think you don't even need to store it beyond the duration of the
PostTask.

(See ssl_policy.cc comment.)

[clamy, 2015/11/20 13:50:42]

Done.

-  SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
-                  ResourceType resource_type,
-                  const GURL& url,
-                  int render_process_id,
-                  int render_frame_id);
+  SSLErrorHandler(
+      const base::WeakPtr<Delegate>& delegate,
+      ResourceType resource_type,
+      const GURL& url,
+      const ResourceRequestInfo::WebContentsGetterOnUI& web_contents_getter);
 
   virtual ~SSLErrorHandler();
 
@@ -137,10 +140,9 @@ 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_;
+  // We use this member to find the correct SSLManager when we arrive on the UI
+  // thread.
+  ResourceRequestInfo::WebContentsGetterOnUI web_contents_getter_;
 
   // The URL that we requested.
   // This read-only member can be accessed on any thread.