| Index: chrome/browser/net/chrome_extensions_network_delegate.cc
|
| diff --git a/chrome/browser/net/chrome_extensions_network_delegate.cc b/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| index c551584d149ac68a1b4ef867c11080acf43cfe02..77e2518856c41298d7d3cd72046d639c62362b26 100644
|
| --- a/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| @@ -30,6 +30,7 @@ enum RequestStatus { REQUEST_STARTED, REQUEST_DONE };
|
| // for a particular RenderFrame.
|
| void NotifyEPMRequestStatus(RequestStatus status,
|
| void* profile_id,
|
| + uint64 request_id,
|
| int process_id,
|
| int render_frame_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| @@ -47,9 +48,9 @@ void NotifyEPMRequestStatus(RequestStatus status,
|
| content::RenderFrameHost::FromID(process_id, render_frame_id);
|
| if (render_frame_host) {
|
| if (status == REQUEST_STARTED) {
|
| - process_manager->OnNetworkRequestStarted(render_frame_host);
|
| + process_manager->OnNetworkRequestStarted(render_frame_host, request_id);
|
| } else if (status == REQUEST_DONE) {
|
| - process_manager->OnNetworkRequestDone(render_frame_host);
|
| + process_manager->OnNetworkRequestDone(render_frame_host, request_id);
|
| } else {
|
| NOTREACHED();
|
| }
|
| @@ -69,9 +70,10 @@ void ForwardRequestStatus(
|
|
|
| int process_id, render_frame_id;
|
| if (info->GetAssociatedRenderFrame(&process_id, &render_frame_id)) {
|
| - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&NotifyEPMRequestStatus,
|
| - status, profile_id, process_id, render_frame_id));
|
| + BrowserThread::PostTask(
|
| + BrowserThread::UI, FROM_HERE,
|
| + base::Bind(&NotifyEPMRequestStatus, status, profile_id,
|
| + request->identifier(), process_id, render_frame_id));
|
| }
|
| }
|
|
|
|
|