Index: headless/public/util/generic_url_request_job.cc |
diff --git a/headless/public/util/generic_url_request_job.cc b/headless/public/util/generic_url_request_job.cc |
index b9a3b68ad8d740852b46ccb57ea25a6038fcbfa1..ba3539746724b6c0e36f01da0d17cdf723c366cc 100644 |
--- a/headless/public/util/generic_url_request_job.cc |
+++ b/headless/public/util/generic_url_request_job.cc |
@@ -202,19 +202,12 @@ int GenericURLRequestJob::GetFrameTreeNodeId() const { |
// requests, but not for browser side navigations. |
int render_process_id; |
int render_frame_routing_id; |
- if (content::ResourceRequestInfo::GetRenderFrameForRequest( |
+ if (headless_browser_context_ && |
Sami
2017/05/05 16:57:13
Is this now always guaranteed to be non-null?
alex clarke (OOO till 29th)
2017/05/08 10:08:22
Yes it should be.
|
+ content::ResourceRequestInfo::GetRenderFrameForRequest( |
request_, &render_process_id, &render_frame_routing_id) && |
render_process_id != -1) { |
- if (headless_browser_context_) { |
- return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_) |
- ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id); |
- } |
- // TODO(alexclarke): Remove this. |
- content::RenderFrameHost* render_frame_host = |
- content::RenderFrameHost::FromID(render_process_id, |
- render_frame_routing_id); |
- DCHECK(render_frame_host); |
- return render_frame_host->GetFrameTreeNodeId(); |
+ return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_) |
+ ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id); |
} |
// ResourceRequestInfo::GetFrameTreeNodeId is only set for browser side |
// navigations. |