Add a WebContents getter callback in ResourceRequestInfo

content/public/browser/resource_request_info.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_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 #define CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 
 #include "base/basictypes.h"
+#include "base/callback.h"

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

callback_forward.h

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

Done.

 #include "content/common/content_export.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/common/resource_type.h"
 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/base/page_transition_types.h"
 
 namespace net {
 class URLRequest;
 }
 
 namespace content {
@@ skipping 24 matching lines @@
 
   // Returns the associated RenderFrame for a given process. Returns false, if
   // there is no associated RenderFrame. This method does not rely on the
   // request being allocated by the ResourceDispatcherHost, but works for all
   // URLRequests that are associated with a RenderFrame.
   CONTENT_EXPORT static bool GetRenderFrameForRequest(
       const net::URLRequest* request,
       int* render_process_id,
       int* render_frame_id);
 
+  // Returns a callback that returns a pointer to the WebContents this request
+  // is asscoaited with, or nullptr if it does not exit. The callback should

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

asscoaited -> associated
exit -> exist

Probably also add:

 // Note: not all resource requests will be owned by a WebContents. For example,
requests made by a ServiceWorker.

(Aside: Really, this ought to be "is owned by", I think, but it might be too
early for that? Downloads still return WebContentses right now and I'd like to
disconnect that, once the ResourceLoader becomes more cleaned up.)

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

Done.

+  // only run on the UI thread.
+  using WebContentsGetterOnUI = base::Callback<WebContents*(void)>;

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

base::Callback<WebContents*(void)> isn't much longer. I think I might advocate
just using that, especially since it shouldn't appear in all that many type
signatures. I don't have strong preferences though.

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

Done.

+  virtual WebContentsGetterOnUI GetWebContentsForRequest() = 0;
+
   // Returns the associated ResourceContext.
   virtual ResourceContext* GetContext() const = 0;
 
   // The child process unique ID of the requestor.

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

// Use GetWebContentsForRequest() instead.
(Or is this too early?)

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

Done.

   virtual int GetChildID() const = 0;
 
   // The IPC route identifier for this request (this identifies the RenderView
   // or like-thing in the renderer that the request gets routed to).

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

// Use GetWebContentsForRequest() instead.
(Or is this too early?)

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

Done. I don't think it's too early, most people are going to cast it to a
WebContents using the exact same code the callback uses internally.

   virtual int GetRouteID() const = 0;
 
   // The pid of the originating process, if the request is sent on behalf of a
   // another process.  Otherwise it is 0.
   virtual int GetOriginPID() const = 0;
 
   // Unique identifier (within the scope of the child process) for this request.
   virtual int GetRequestID() const = 0;
 
   // The IPC route identifier of the RenderFrame.
   // TODO(jam): once all navigation and resource requests are sent between
   // frames and RenderView/RenderViewHost aren't involved we can remove this and
   // just use GetRouteID above.

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

// Use GetWebContentsForRequest() instead.
(Or is this too early?)

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

Done.

   virtual int GetRenderFrameID() const = 0;
 
   // True if GetRenderFrameID() represents a main frame in the RenderView.
   virtual bool IsMainFrame() const = 0;
 
   // True if GetParentRenderFrameID() represents a main frame in the RenderView.
   virtual bool ParentIsMainFrame() const = 0;
 
   // Routing ID of parent frame of frame that sent this resource request.
   // -1 if unknown / invalid.
@@ skipping 43 matching lines @@
   // Whether this request if using Lo-Fi mode.
   virtual bool IsUsingLoFi() const = 0;
 
  protected:
   virtual ~ResourceRequestInfo() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_