From 4db27d802c70279a1e54f028c35eb9ff658fdd6c Mon Sep 17 00:00:00 2001 From: "hashimoto@chromium.org" Date: Thu, 20 Dec 2012 11:50:24 +0000 Subject: net: Split sync part of UploadFileElementReader as UploadFileElementReaderSync Add UploadFileElementReaderSync and use it from Chrome Frame. Remove UploadDataStream::InitSync/ReadSync Remove UploadElementReader::InitSync/ReadSync Allow passing null callbacks for Init/Read when callers can be confident that the operation finishes synchronously. BUG=None TEST=net_unittests, chrome_frame_net_tests TBR=ananta@chromium.org for chrome_frame/urlmon_upload_data_stream.cc Review URL: https://chromiumcodereview.appspot.com/11587007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174133 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_stream_parser.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/http/http_stream_parser.cc') diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 95e2ba6..d08d62db 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -255,8 +255,8 @@ int HttpStreamParser::SendRequest(const std::string& request_line, size_t todo = request_->upload_data_stream->size(); while (todo) { - int consumed = request_->upload_data_stream->ReadSync(request_headers_, - todo); + int consumed = request_->upload_data_stream->Read(request_headers_, todo, + CompletionCallback()); DCHECK_GT(consumed, 0); // Read() won't fail if not chunked. request_headers_->DidConsume(consumed); todo -= consumed; -- cgit v1.1