Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: net/url_request/url_request_test_util.cc

Issue 2542843006: ResourceLoader: Fix a bunch of double-cancellation/double-error notification cases. (Closed)
Patch Set: Fix merge Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index cc56ef300f17749a68d8e34a8ad93fb986611921..7ce435a23e6a008ee6bec1953601133106235a1a 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -290,15 +290,22 @@ void TestDelegate::OnReadCompleted(URLRequest* request, int bytes_read) {
if (response_started_count_ == 0)
received_data_before_response_ = true;
- if (cancel_in_rd_)
- request_status_ = request->Cancel();
-
if (bytes_read >= 0) {
// There is data to read.
received_bytes_count_ += bytes_read;
- // consume the data
+ // Consume the data.
data_received_.append(buf_->data(), bytes_read);
+
+ if (cancel_in_rd_) {
+ request_status_ = request->Cancel();
+ // If bytes_read is 0, won't get a notification on cancelation.
+ if (bytes_read == 0 && quit_on_complete_) {
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
+ }
+ return;
+ }
}
// If it was not end of stream, request to read more.
« no previous file with comments | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698