UploadDataStream now returns errors on failures

net/base/upload_data_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_data_stream.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 91 matching lines @@
   if (result == OK) {
     initialized_successfully_ = true;
     if (!is_chunked_ && total_size_ == 0)
       is_eof_ = true;
   }
   if (!callback_.is_null())
     base::ResetAndReturn(&callback_).Run(result);
 }
 
 void UploadDataStream::OnReadCompleted(int result) {
-  DCHECK_GE(result, 0);
-  DCHECK(initialized_successfully_);
+  if (result > 0) {
+    DCHECK(initialized_successfully_);

[mmenke, 2016/06/06 16:22:33]

I think this DCHECK can go before the if.

[maksims (do not use this acc), 2016/06/21 11:09:25]

Done.

 
-  current_position_ += result;
-  if (!is_chunked_) {
-    DCHECK_LE(current_position_, total_size_);
-    if (current_position_ == total_size_)
-      is_eof_ = true;
+    current_position_ += result;
+    if (!is_chunked_) {
+      DCHECK_LE(current_position_, total_size_);
+      if (current_position_ == total_size_)
+        is_eof_ = true;
+    }
+
+    DCHECK(result > 0 || is_eof_);

[mmenke, 2016/06/06 16:22:33]

This DCHECK no longer does anything.

Suggest moving it above the if, and replacing it with:

DCHECK(result != 0 || is_eof_);
DCHECK_NE(ERR_IO_PENDING, result);

[maksims (do not use this acc), 2016/06/21 11:09:25]

Done.

   }
 
-  DCHECK(result > 0 || is_eof_);
-
   if (!callback_.is_null())
     base::ResetAndReturn(&callback_).Run(result);
 }
 
 }  // namespace net