Remove request_id parameter from ResourceHandler methods.

AsyncResourceHandler and downloads are the only components which consume it.
Everyone else just passes it down. Pull it out of ResourceRequestInfo
where needed. Other components need not deal with it.

BUG=376003

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273368 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 20 deletions

diff --git a/content/browser/loader/sync_resource_handler.cc b/content/browser/loader/sync_resource_handler.cc
index 865b29e..090b939 100644
--- a/content/browser/loader/sync_resource_handler.cc
+++ b/content/browser/loader/sync_resource_handler.cc
@@ -10,7 +10,6 @@
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/common/resource_messages.h"
-#include "content/public/browser/global_request_id.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/io_buffer.h"
@@ -41,14 +40,11 @@ SyncResourceHandler::~SyncResourceHandler() {
   }
 }
 
-bool SyncResourceHandler::OnUploadProgress(int request_id,
-                                           uint64 position,
-                                           uint64 size) {
+bool SyncResourceHandler::OnUploadProgress(uint64 position, uint64 size) {
   return true;
 }
 
 bool SyncResourceHandler::OnRequestRedirected(
-    int request_id,
     const GURL& new_url,
     ResourceResponse* response,
     bool* defer) {
@@ -72,7 +68,6 @@ bool SyncResourceHandler::OnRequestRedirected(
 }
 
 bool SyncResourceHandler::OnResponseStarted(
-    int request_id,
     ResourceResponse* response,
     bool* defer) {
   const ResourceRequestInfoImpl* info = GetRequestInfo();
@@ -98,20 +93,15 @@ bool SyncResourceHandler::OnResponseStarted(
   return true;
 }
 
-bool SyncResourceHandler::OnWillStart(int request_id,
-                                      const GURL& url,
-                                      bool* defer) {
+bool SyncResourceHandler::OnWillStart(const GURL& url, bool* defer) {
   return true;
 }
 
-bool SyncResourceHandler::OnBeforeNetworkStart(int request_id,
-                                               const GURL& url,
-                                               bool* defer) {
+bool SyncResourceHandler::OnBeforeNetworkStart(const GURL& url, bool* defer) {
   return true;
 }
 
-bool SyncResourceHandler::OnWillRead(int request_id,
-                                     scoped_refptr<net::IOBuffer>* buf,
+bool SyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                                      int* buf_size,
                                      int min_size) {
   DCHECK(min_size == -1);
@@ -120,8 +110,7 @@ bool SyncResourceHandler::OnWillRead(int request_id,
   return true;
 }
 
-bool SyncResourceHandler::OnReadCompleted(int request_id, int bytes_read,
-                                          bool* defer) {
+bool SyncResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
   if (!bytes_read)
     return true;
   result_.data.append(read_buffer_->data(), bytes_read);
@@ -129,7 +118,6 @@ bool SyncResourceHandler::OnReadCompleted(int request_id, int bytes_read,
 }
 
 void SyncResourceHandler::OnResponseCompleted(
-    int request_id,
     const net::URLRequestStatus& status,
     const std::string& security_info,
     bool* defer) {
@@ -148,9 +136,7 @@ void SyncResourceHandler::OnResponseCompleted(
   return;
 }
 
-void SyncResourceHandler::OnDataDownloaded(
-    int request_id,
-    int bytes_downloaded) {
+void SyncResourceHandler::OnDataDownloaded(int bytes_downloaded) {
   // Sync requests don't involve ResourceMsg_DataDownloaded messages
   // being sent back to renderers as progress is made.
 }