Add a WebContents getter callback in ResourceRequestInfo

content/browser/ssl/ssl_error_handler.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.
 
 #ifndef CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 #define CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #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"
 
 namespace net {
 class SSLInfo;
 class URLRequest;
 }  // namespace net
 
 namespace content {
 
@@ skipping 64 matching lines @@
   // warning message).
   // This method can be called from OnDispatchFailed and OnDispatched.
   void DenyRequest();
 
   // Does nothing on the net::URLRequest but ensures the current instance ref
   // count is decremented appropriately.  Subclasses that do not want to
   // take any specific actions in their OnDispatched/OnDispatchFailed should
   // 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();
 
   // 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 delegate we are associated with.
   base::WeakPtr<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();
 
   // Derefs this instance.
   // 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.
   const GURL request_url_;
 
   // What kind of resource is associated with the requested that generated
   // that error.
   // This read-only member can be accessed on any thread.
   const ResourceType 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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SSL_SSL_ERROR_HANDLER_H_