Return unique_ptr<WebDataConsumerHandle::Reader> directly from obtainReader

third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

 // 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 "modules/fetch/FetchBlobDataConsumerHandle.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/MockThreadableLoader.h"
 #include "core/loader/ThreadableLoaderClient.h"
@@ skipping 340 matching lines @@
 
 TEST_F(FetchBlobDataConsumerHandleTest, DrainAsBlobDataHandle)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
 
     RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
     std::unique_ptr<FetchDataConsumerHandle> handle
         = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);
 
     size_t size = 0;
-    EXPECT_EQ(blobDataHandle, handle->obtainReader(nullptr)->drainAsBlobDataHandle());
-    EXPECT_FALSE(handle->obtainReader(nullptr)->drainAsFormData());
+    EXPECT_EQ(blobDataHandle, handle->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle());
+    EXPECT_FALSE(handle->obtainFetchDataReader(nullptr)->drainAsFormData());
 
     EXPECT_EQ(kDone, handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size));
 }
 
 TEST_F(FetchBlobDataConsumerHandleTest, DrainAsFormData)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
 
     RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
     std::unique_ptr<FetchDataConsumerHandle> handle
         = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);
 
-    RefPtr<EncodedFormData> formData = handle->obtainReader(nullptr)->drainAsFormData();
+    RefPtr<EncodedFormData> formData = handle->obtainFetchDataReader(nullptr)->drainAsFormData();
     ASSERT_TRUE(formData);
     EXPECT_TRUE(formData->isSafeToSendToAnotherThread());
     ASSERT_EQ(1u, formData->elements().size());
     EXPECT_EQ(FormDataElement::encodedBlob, formData->elements()[0].m_type);
     EXPECT_EQ(blobDataHandle->uuid(), formData->elements()[0].m_blobUUID);
     EXPECT_EQ(blobDataHandle, formData->elements()[0].m_optionalBlobDataHandle);
 
-    EXPECT_FALSE(handle->obtainReader(nullptr)->drainAsBlobDataHandle());
+    EXPECT_FALSE(handle->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle());
     size_t size;
-    EXPECT_EQ(kDone, handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size));
+    EXPECT_EQ(kDone, handle->obtainFetchDataReader(nullptr)->read(nullptr, 0, kNone, &size));
 }
 
 TEST_F(FetchBlobDataConsumerHandleTest, ZeroByteReadDoesNotAffectDraining)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
 
     RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
     std::unique_ptr<FetchDataConsumerHandle> handle
         = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);
-    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);
+    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);
 
     size_t readSize;
     EXPECT_EQ(kShouldWait, reader->read(nullptr, 0, kNone, &readSize));
     EXPECT_EQ(blobDataHandle, reader->drainAsBlobDataHandle());
 }
 
 TEST_F(FetchBlobDataConsumerHandleTest, OneByteReadAffectsDraining)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
 
     RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
     std::unique_ptr<FetchDataConsumerHandle> handle
         = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);
-    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);
+    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);
 
     size_t readSize;
     char c;
     EXPECT_EQ(kShouldWait, reader->read(&c, 1, kNone, &readSize));
     EXPECT_FALSE(reader->drainAsFormData());
 }
 
 TEST_F(FetchBlobDataConsumerHandleTest, BeginReadAffectsDraining)
 {
     auto factory = new StrictMock<MockLoaderFactory>;
 
     RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");
     std::unique_ptr<FetchDataConsumerHandle> handle
         = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);
-    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);
+    std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);
 
     const void* buffer;
     size_t available;
     EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available));
     EXPECT_FALSE(reader->drainAsBlobDataHandle());
 }
 
 } // namespace
 } // namespace blink