From 3780874a5b4d7470daf71357a7d5d001347f50b7 Mon Sep 17 00:00:00 2001 From: "davidben@chromium.org" Date: Mon, 18 Nov 2013 05:49:03 +0000 Subject: Make ResourceHandler::OnResponseCompleted take a defer output parameter. Every other method of ResourceHandler returns false to abort and sets *defer to cancel. Between the StreamResourceHandler fix here and https://src.chromium.org/viewvc/chrome?view=rev&revision=233661, there were twice as many ResourceHandlers that mistakenly deferred shutdown as intentionally. (RedirectToFileResourceHandler and CrossSiteResourceHandler do so intentionally.) Make this consistent so it's not as confusing. BUG=none Review URL: https://codereview.chromium.org/74373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235631 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/loader/stream_resource_handler.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'content/browser/loader/stream_resource_handler.cc') diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc index 8c8aae0..67309e8 100644 --- a/content/browser/loader/stream_resource_handler.cc +++ b/content/browser/loader/stream_resource_handler.cc @@ -93,12 +93,12 @@ bool StreamResourceHandler::OnReadCompleted(int request_id, return true; } -bool StreamResourceHandler::OnResponseCompleted( +void StreamResourceHandler::OnResponseCompleted( int request_id, const net::URLRequestStatus& status, - const std::string& sec_info) { + const std::string& sec_info, + bool* defer) { stream_->Finalize(); - return status.status() == net::URLRequestStatus::SUCCESS; } void StreamResourceHandler::OnDataDownloaded( -- cgit v1.1