Stop FetchDataLoaderTest from using [Web|Fetch]DataConsumerHandle.

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

 // Copyright 2016 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/FormDataBytesConsumer.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/Document.h"
 #include "core/html/FormData.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BytesConsumerTestUtil.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 namespace {
 
 using Result = BytesConsumer::Result;
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Return;
 using Checkpoint = ::testing::StrictMock<::testing::MockFunction<void(int)>>;
+using MockBytesConsumer = BytesConsumerTestUtil::MockBytesConsumer;
 
 String toString(const Vector<char>& v)
 {
     return String(v.data(), v.size());
 }
 
 PassRefPtr<EncodedFormData> complexFormData()
 {
     RefPtr<EncodedFormData> data = EncodedFormData::create();
 
@@ skipping 10 matching lines @@
     data->setBoundary(boundary);
     return data.release();
 }
 
 class NoopClient final : public GarbageCollectedFinalized<NoopClient>, public BytesConsumer::Client {
     USING_GARBAGE_COLLECTED_MIXIN(NoopClient);
 public:
     void onStateChange() override {}
 };
 
-class MockBytesConsumer : public BytesConsumer {
-public:
-    static MockBytesConsumer* create() { return new ::testing::StrictMock<MockBytesConsumer>(); }
-
-    MOCK_METHOD2(beginRead, Result(const char**, size_t*));
-    MOCK_METHOD1(endRead, Result(size_t));
-    MOCK_METHOD1(setClient, void(Client*));
-    MOCK_METHOD0(clearClient, void());
-    MOCK_METHOD0(cancel, void());
-    MOCK_CONST_METHOD0(getPublicState, PublicState());
-    MOCK_CONST_METHOD0(getError, Error());
-
-    String debugName() const override { return "MockBytesConsumer"; }
-
-protected:
-    MockBytesConsumer() = default;
-};
-
 class FormDataBytesConsumerTest : public ::testing::Test {
 public:
     FormDataBytesConsumerTest() : m_page(DummyPageHolder::create()) {}
 
 protected:
     Document* getDocument() { return &m_page->document(); }
 
     std::unique_ptr<DummyPageHolder> m_page;
 };
 
@@ skipping 229 matching lines @@
 
     const char* buffer = nullptr;
     size_t available = 0;
     Checkpoint checkpoint;
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*underlying, beginRead(&buffer, &available)).WillOnce(Return(Result::Ok));
     EXPECT_CALL(*underlying, endRead(0)).WillOnce(Return(Result::Ok));
     EXPECT_CALL(checkpoint, Call(2));
     // drainAsFormData / drainAsBlobDataHandle should not be called here.

[yhirano, 2016/09/30 09:18:09]

I think this expectation was wrong. Calling drainAsBLobDataHandle is not a
problem because it will return null as beginRead or cancel has been requested.

MockBytesConsumer defined this class didn't have drainAsFormData and
drainAsBlobDataHandle implementations, so this test had been broken anyway.

     EXPECT_CALL(checkpoint, Call(3));
     // |consumer| delegates the getPublicState call to |underlying|.
     EXPECT_CALL(*underlying, getPublicState()).WillOnce(Return(BytesConsumer::PublicState::ReadableOrWaiting));
     EXPECT_CALL(checkpoint, Call(4));
 
     checkpoint.Call(1);
     ASSERT_EQ(Result::Ok, consumer->beginRead(&buffer, &available));
     ASSERT_EQ(Result::Ok, consumer->endRead(0));
     checkpoint.Call(2);
     EXPECT_FALSE(consumer->drainAsFormData());
@@ skipping 38 matching lines @@
     EXPECT_CALL(*underlying, cancel());
     EXPECT_CALL(checkpoint, Call(2));
 
     checkpoint.Call(1);
     consumer->cancel();
     checkpoint.Call(2);
 }
 
 } // namespace
 } // namespace blink