Add the actual data being read to the OnBytesRead callback, take two.

This change was originally committed as
http://src.chromium.org/viewvc/chrome?view=rev&revision=53178
then rolled back as
http://src.chromium.org/viewvc/chrome?view=rev&revision=53416
due to a breakage in FLAKY_UnknownSize download test.
FLAKY_UnknownSize depended on code with a bug that was exposed by this change. That bug has since been fixed and committed as
http://src.chromium.org/viewvc/chrome?view=rev&revision=53876

So this change is ready for another round of review. It has not changed at all since being committed.

Contributed by: bmcquade@google.com

BUG=48192
TEST=Added new unit tests, ran net_unittests.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=54448

Review URL: http://codereview.chromium.org/3010037

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

3 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index ba49af3..e5c11e4 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -249,7 +249,7 @@ class NetworkLibraryImpl : public NetworkLibrary,
     CheckNetworkTraffic(false);
   }
 
-  void OnBytesRead(URLRequestJob* job, int byte_count) {
+  void OnBytesRead(URLRequestJob* job, const char* buf, int byte_count) {
     CheckNetworkTraffic(true);
   }
 
@@ -1016,7 +1016,7 @@ class NetworkLibraryStubImpl : public NetworkLibrary {
   void OnJobDone(URLRequestJob* job, const URLRequestStatus& status) {}
   void OnJobRedirect(
       URLRequestJob* job, const GURL& location, int status_code) {}
-  void OnBytesRead(URLRequestJob* job, int byte_count) {}
+  void OnBytesRead(URLRequestJob* job, const char* buf, int byte_count) {}
   void AddObserver(Observer* observer) {}
   void RemoveObserver(Observer* observer) {}
   virtual const EthernetNetwork& ethernet_network() const {
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 5860fb5..8677620 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -837,7 +837,8 @@ void TaskManagerModel::OnJobRedirect(URLRequestJob* job,
                                      int status_code) {
 }
 
-void TaskManagerModel::OnBytesRead(URLRequestJob* job, int byte_count) {
+void TaskManagerModel::OnBytesRead(URLRequestJob* job, const char* buf,
+                                   int byte_count) {
   int render_process_host_child_id = -1, routing_id = -1;
   ResourceDispatcherHost::RenderViewForRequest(job->request(),
                                                &render_process_host_child_id,
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 9326813..9c84f3c 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -238,7 +238,7 @@ class TaskManagerModel : public URLRequestJobTracker::JobObserver,
   void OnJobRemoved(URLRequestJob* job);
   void OnJobDone(URLRequestJob* job, const URLRequestStatus& status);
   void OnJobRedirect(URLRequestJob* job, const GURL& location, int status_code);
-  void OnBytesRead(URLRequestJob* job, int byte_count);
+  void OnBytesRead(URLRequestJob* job, const char* buf, int byte_count);
 
   void AddResourceProvider(TaskManager::ResourceProvider* provider);
   void RemoveResourceProvider(TaskManager::ResourceProvider* provider);