Commit e7325fc3 authored by davidben's avatar davidben Committed by Commit bot

Unexpose ResourceRequestInfo::GetRequestID.

This is never used outside of //content.

BUG=376003

Review URL: https://codereview.chromium.org/1463013003

Cr-Commit-Position: refs/heads/master@{#361206}
parent 4d208007
......@@ -499,7 +499,7 @@ void DownloadResourceHandler::ResumeRequest() {
void DownloadResourceHandler::CancelRequest() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
const ResourceRequestInfo* info = GetRequestInfo();
const ResourceRequestInfoImpl* info = GetRequestInfo();
ResourceDispatcherHostImpl::Get()->CancelRequest(
info->GetChildID(),
info->GetRequestID());
......@@ -507,7 +507,7 @@ void DownloadResourceHandler::CancelRequest() {
}
std::string DownloadResourceHandler::DebugString() const {
const ResourceRequestInfo* info = GetRequestInfo();
const ResourceRequestInfoImpl* info = GetRequestInfo();
return base::StringPrintf("{"
" url_ = " "\"%s\""
" info = {"
......
......@@ -730,8 +730,8 @@ ResourceDispatcherHostImpl::CreateResourceHandlerForDownload(
scoped_ptr<ResourceHandler> handler(
new DownloadResourceHandler(id, request, started_cb, save_info.Pass()));
if (delegate_) {
const ResourceRequestInfo* request_info(
ResourceRequestInfo::ForRequest(request));
const ResourceRequestInfoImpl* request_info(
ResourceRequestInfoImpl::ForRequest(request));
ScopedVector<ResourceThrottle> throttles;
delegate_->DownloadStarting(
......@@ -884,7 +884,7 @@ void ResourceDispatcherHostImpl::DidReceiveResponse(ResourceLoader* loader) {
}
void ResourceDispatcherHostImpl::DidFinishLoading(ResourceLoader* loader) {
ResourceRequestInfo* info = loader->GetRequestInfo();
ResourceRequestInfoImpl* info = loader->GetRequestInfo();
// Record final result of all resource loads.
if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME) {
......
......@@ -184,10 +184,6 @@ int ResourceRequestInfoImpl::GetOriginPID() const {
return origin_pid_;
}
int ResourceRequestInfoImpl::GetRequestID() const {
return request_id_;
}
int ResourceRequestInfoImpl::GetRenderFrameID() const {
return render_frame_id_;
}
......@@ -273,6 +269,10 @@ void ResourceRequestInfoImpl::AssociateWithRequest(net::URLRequest* request) {
}
}
int ResourceRequestInfoImpl::GetRequestID() const {
return request_id_;
}
GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
return GlobalRequestID(child_id_, request_id_);
}
......
......@@ -74,7 +74,6 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
int GetChildID() const override;
int GetRouteID() const override;
int GetOriginPID() const override;
int GetRequestID() const override;
int GetRenderFrameID() const override;
bool IsMainFrame() const override;
bool ParentIsMainFrame() const override;
......@@ -95,6 +94,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
CONTENT_EXPORT void AssociateWithRequest(net::URLRequest* request);
CONTENT_EXPORT int GetRequestID() const;
CONTENT_EXPORT GlobalRequestID GetGlobalRequestID() const;
GlobalRoutingID GetGlobalRoutingID() const;
......
......@@ -65,9 +65,6 @@ class ResourceRequestInfo {
// 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment