[BlobAsync] Adding better error reporting and some new tests.

storage/browser/blob/blob_reader.cc

 // Copyright 2015 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 "storage/browser/blob/blob_reader.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 21 matching lines @@
 namespace {
 bool IsFileType(DataElement::Type type) {
   switch (type) {
     case DataElement::TYPE_FILE:
     case DataElement::TYPE_FILE_FILESYSTEM:
       return true;
     default:
       return false;
   }
 }
+
+int TransformBlobErrorToNetError(IPCBlobCreationCancelCode reason) {

[kinuko, 2016/04/05 09:42:35]

nit: ditto, ConvertBlobError?

[dmurph, 2016/04/05 18:15:23]

Done.

+  switch (reason) {
+    case IPCBlobCreationCancelCode::UNKNOWN:
+      return net::ERR_FAILED;
+    case IPCBlobCreationCancelCode::OUT_OF_MEMORY:
+      return net::ERR_OUT_OF_MEMORY;
+    case IPCBlobCreationCancelCode::FILE_WRITE_FAILED:
+      return net::ERR_FILE_NO_SPACE;
+    case IPCBlobCreationCancelCode::SOURCE_DIED_IN_TRANSIT:
+      return net::ERR_UNEXPECTED;
+    case IPCBlobCreationCancelCode::BLOB_DEREFERENCED_WHILE_BUILDING:
+      return net::ERR_UNEXPECTED;
+    case IPCBlobCreationCancelCode::REFERENCED_BLOB_BROKEN:
+      return net::ERR_INVALID_HANDLE;
+  }
+  NOTREACHED();
+  return net::ERR_FAILED;
+}
 }  // namespace
 
 BlobReader::FileStreamReaderProvider::~FileStreamReaderProvider() {}
 
 BlobReader::BlobReader(
     const BlobDataHandle* blob_handle,
     std::unique_ptr<FileStreamReaderProvider> file_stream_provider,
     base::SequencedTaskRunner* file_task_runner)
     : file_stream_provider_(std::move(file_stream_provider)),
       file_task_runner_(file_task_runner),
@@ skipping 126 matching lines @@
   read_buf_ = nullptr;
   done.Run(net_error);
 }
 
 BlobReader::Status BlobReader::ReportError(int net_error) {
   net_error_ = net_error;
   return Status::NET_ERROR;
 }
 
 void BlobReader::AsyncCalculateSize(const net::CompletionCallback& done,
-                                    bool async_succeeded) {
+                                    bool async_succeeded,
+                                    IPCBlobCreationCancelCode reason) {
   if (!async_succeeded) {
-    InvalidateCallbacksAndDone(net::ERR_FAILED, done);
+    InvalidateCallbacksAndDone(TransformBlobErrorToNetError(reason), done);
     return;
   }
   DCHECK(!blob_handle_->IsBroken()) << "Callback should have returned false.";
   blob_data_ = blob_handle_->CreateSnapshot();
   Status size_status = CalculateSizeImpl(done);
   switch (size_status) {
     case Status::NET_ERROR:
       InvalidateCallbacksAndDone(net_error_, done);
       return;
     case Status::DONE:
@@ skipping 398 matching lines @@
       index_to_reader_.erase(found);
       return;
     }
     found->second = reader.release();
   } else if (reader.get()) {
     index_to_reader_[current_item_index_] = reader.release();
   }
 }
 
 }  // namespace storage