Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Side by Side Diff: headless/public/util/generic_url_request_job.cc

Issue 2863953003: Headless: Remove obsolete Mojo code and some other obsolete APIs (Closed)
Patch Set: Rebased Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "headless/public/util/generic_url_request_job.h" 5 #include "headless/public/util/generic_url_request_job.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 } 184 }
185 185
186 int GenericURLRequestJob::GetFrameTreeNodeId() const { 186 int GenericURLRequestJob::GetFrameTreeNodeId() const {
187 // URLRequestUserData will be set for all renderer initiated resource 187 // URLRequestUserData will be set for all renderer initiated resource
188 // requests, but not for browser side navigations. 188 // requests, but not for browser side navigations.
189 int render_process_id; 189 int render_process_id;
190 int render_frame_routing_id; 190 int render_frame_routing_id;
191 if (content::ResourceRequestInfo::GetRenderFrameForRequest( 191 if (content::ResourceRequestInfo::GetRenderFrameForRequest(
192 request_, &render_process_id, &render_frame_routing_id) && 192 request_, &render_process_id, &render_frame_routing_id) &&
193 render_process_id != -1) { 193 render_process_id != -1) {
194 if (headless_browser_context_) { 194 DCHECK(headless_browser_context_);
195 return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_) 195 return static_cast<HeadlessBrowserContextImpl*>(headless_browser_context_)
196 ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id); 196 ->GetFrameTreeNodeId(render_process_id, render_frame_routing_id);
197 }
198 // TODO(alexclarke): Remove this.
199 content::RenderFrameHost* render_frame_host =
200 content::RenderFrameHost::FromID(render_process_id,
201 render_frame_routing_id);
202 DCHECK(render_frame_host);
203 return render_frame_host->GetFrameTreeNodeId();
204 } 197 }
205 // ResourceRequestInfo::GetFrameTreeNodeId is only set for browser side 198 // ResourceRequestInfo::GetFrameTreeNodeId is only set for browser side
206 // navigations. 199 // navigations.
207 if (request_resource_info_) 200 if (request_resource_info_)
208 return request_resource_info_->GetFrameTreeNodeId(); 201 return request_resource_info_->GetFrameTreeNodeId();
209 202
210 // This should only happen in tests. 203 // This should only happen in tests.
211 return -1; 204 return -1;
212 } 205 }
213 206
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 334 }
342 335
343 mock_response_ = std::move(mock_response); 336 mock_response_ = std::move(mock_response);
344 337
345 OnFetchCompleteExtractHeaders(request_->url(), 338 OnFetchCompleteExtractHeaders(request_->url(),
346 mock_response_->response_data.data(), 339 mock_response_->response_data.data(),
347 mock_response_->response_data.size()); 340 mock_response_->response_data.size());
348 } 341 }
349 342
350 } // namespace headless 343 } // namespace headless
OLDNEW
« no previous file with comments | « headless/public/util/generic_url_request_job.h ('k') | headless/public/util/generic_url_request_job_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698