summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/cros
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 12:13:14 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 12:13:14 +0000
commit446b1856d31c70cac44552dd1536a8e3a90ea850 (patch)
treed236d42d0503adaa95270befd830606c0d29b4a2 /chrome/browser/chromeos/cros
parent510acee3c06adff88557f4699dd47e4ab9937b25 (diff)
downloadchromium_src-446b1856d31c70cac44552dd1536a8e3a90ea850.zip
chromium_src-446b1856d31c70cac44552dd1536a8e3a90ea850.tar.gz
chromium_src-446b1856d31c70cac44552dd1536a8e3a90ea850.tar.bz2
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. Review URL: http://codereview.chromium.org/3010037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
-rw-r--r--chrome/browser/chromeos/cros/network_library.cc5
-rw-r--r--chrome/browser/chromeos/cros/network_library.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index ba16587..e653a24 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -250,11 +250,12 @@ void NetworkLibraryImpl::OnJobDone(URLRequestJob* job,
}
void NetworkLibraryImpl::OnJobRedirect(URLRequestJob* job, const GURL& location,
- int status_code) {
+ int status_code) {
CheckNetworkTraffic(false);
}
-void NetworkLibraryImpl::OnBytesRead(URLRequestJob* job, int byte_count) {
+void NetworkLibraryImpl::OnBytesRead(URLRequestJob* job, const char* buf,
+ int byte_count) {
CheckNetworkTraffic(true);
}
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 0a7e5a2..c8d3f2c 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -390,7 +390,7 @@ class NetworkLibraryImpl : public NetworkLibrary,
virtual void OnJobDone(URLRequestJob* job, const URLRequestStatus& status);
virtual void OnJobRedirect(URLRequestJob* job, const GURL& location,
int status_code);
- virtual void OnBytesRead(URLRequestJob* job, int byte_count);
+ virtual void OnBytesRead(URLRequestJob* job, const char* buf, int byte_count);
// NetworkLibrary overrides.
virtual void AddObserver(Observer* observer);