Revert of [Blob] BlobReader class & tests, and removal of all redundant reading.

content/browser/fileapi/blob_url_request_job_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 97 matching lines @@
   class MockProtocolHandler :
       public net::URLRequestJobFactory::ProtocolHandler {
    public:
     MockProtocolHandler(BlobURLRequestJobTest* test) : test_(test) {}
 
     // net::URLRequestJobFactory::ProtocolHandler override.
     net::URLRequestJob* MaybeCreateJob(
         net::URLRequest* request,
         net::NetworkDelegate* network_delegate) const override {
       return new BlobURLRequestJob(request, network_delegate,
-                                   test_->GetHandleFromBuilder(),
+                                   test_->GetSnapshotFromBuilder(),
                                    test_->file_system_context_.get(),
                                    base::ThreadTaskRunnerHandle::Get().get());
     }
 
    private:
     BlobURLRequestJobTest* test_;
   };
 
   BlobURLRequestJobTest()
       : blob_data_(new BlobDataBuilder("uuid")), expected_status_code_(0) {}
@@ skipping 21 matching lines @@
     disk_cache_entry_ = CreateDiskCacheEntry(
         disk_cache_backend_.get(), kTestDiskCacheKey, kTestDiskCacheData);
 
     url_request_job_factory_.SetProtocolHandler(
         "blob", make_scoped_ptr(new MockProtocolHandler(this)));
     url_request_context_.set_job_factory(&url_request_job_factory_);
   }
 
   void TearDown() override {
     blob_handle_.reset();
-    request_.reset();
     // Clean up for ASAN
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
 
   void SetUpFileSystem() {
     // Prepare file system.
     file_system_context_ = CreateFileSystemContextForTesting(
         NULL, temp_dir_.path());
 
@@ skipping 105 matching lines @@
     *expected_result += std::string(kTestData2 + 4, 5);
 
     blob_data_->AppendFile(temp_file2_, 5, 6, temp_file_modification_time2_);
     *expected_result += std::string(kTestFileData2 + 5, 6);
 
     blob_data_->AppendFileSystemFile(temp_file_system_file2_, 6, 7,
                                      temp_file_system_file_modification_time2_);
     *expected_result += std::string(kTestFileSystemFileData2 + 6, 7);
   }
 
-  storage::BlobDataHandle* GetHandleFromBuilder() {
+  scoped_ptr<BlobDataSnapshot> GetSnapshotFromBuilder() {
     if (!blob_handle_) {
       blob_handle_ = blob_context_.AddFinishedBlob(blob_data_.get()).Pass();
     }
-    return blob_handle_.get();
+    return blob_handle_->CreateSnapshot().Pass();
   }
 
   // This only works if all the Blob items have a definite pre-computed length.
   // Otherwise, this will fail a CHECK.
   int64 GetTotalBlobLength() {
     int64 total = 0;
-    scoped_ptr<BlobDataSnapshot> data =
-        GetHandleFromBuilder()->CreateSnapshot();
+    scoped_ptr<BlobDataSnapshot> data = GetSnapshotFromBuilder();
     const auto& items = data->items();
     for (const auto& item : items) {
       int64 length = base::checked_cast<int64>(item->length());
       CHECK(length <= kint64max - total);
       total += length;
     }
     return total;
   }
 
  protected:
@@ skipping 177 matching lines @@
 
   int64 total = GetTotalBlobLength();
   int64 first = 0, last = 0, length = 0;
   EXPECT_TRUE(
       request_->response_headers()->GetContentRange(&first, &last, &length));
   EXPECT_EQ(total - 10, first);
   EXPECT_EQ(total - 1, last);
   EXPECT_EQ(total, length);
 }
 
-TEST_F(BlobURLRequestJobTest, TestGetRangeRequest3) {
-  SetUpFileSystem();
-  std::string result;
-  BuildComplicatedData(&result);
-  net::HttpRequestHeaders extra_headers;
-  extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
-                          net::HttpByteRange::Bounded(0, 2).GetHeaderValue());
-  expected_status_code_ = 206;
-  expected_response_ = result.substr(0, 3);
-  TestRequest("GET", extra_headers);
-
-  EXPECT_EQ(3, request_->response_headers()->GetContentLength());
-
-  int64 first = 0, last = 0, length = 0;
-  EXPECT_TRUE(
-      request_->response_headers()->GetContentRange(&first, &last, &length));
-  EXPECT_EQ(0, first);
-  EXPECT_EQ(2, last);
-  EXPECT_EQ(GetTotalBlobLength(), length);
-}
-
 TEST_F(BlobURLRequestJobTest, TestExtraHeaders) {
   blob_data_->set_content_type(kTestContentType);
   blob_data_->set_content_disposition(kTestContentDisposition);
   blob_data_->AppendData(kTestData1);
   expected_status_code_ = 200;
   expected_response_ = kTestData1;
   TestRequest("GET", net::HttpRequestHeaders());
 
   std::string content_type;
   EXPECT_TRUE(request_->response_headers()->GetMimeType(&content_type));
   EXPECT_EQ(kTestContentType, content_type);
   void* iter = NULL;
   std::string content_disposition;
   EXPECT_TRUE(request_->response_headers()->EnumerateHeader(
       &iter, "Content-Disposition", &content_disposition));
   EXPECT_EQ(kTestContentDisposition, content_disposition);
 }
 
 }  // namespace content