Remove BytesConsumer::read

third_party/WebKit/Source/modules/fetch/BytesConsumerTest.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/BytesConsumer.h"
 
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/BytesConsumerTestUtil.h"
 #include "platform/blob/BlobData.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ skipping 83 matching lines @@
 TEST_F(BytesConsumerTeeTest, CreateDone)
 {
     ReplayingBytesConsumer* src = new ReplayingBytesConsumer(document());
     src->add(Command(Command::Done));
     EXPECT_FALSE(src->isCancelled());
 
     BytesConsumer* dest1 = nullptr;
     BytesConsumer* dest2 = nullptr;
     BytesConsumer::tee(document(), src, &dest1, &dest2);
 
-    auto result1 = (new BytesConsumerTestUtil::Reader(dest1))->run();
-    auto result2 = (new BytesConsumerTestUtil::Reader(dest2))->run();
+    auto result1 = (new BytesConsumerTestUtil::TwoPhaseReader(dest1))->run();
+    auto result2 = (new BytesConsumerTestUtil::TwoPhaseReader(dest2))->run();
 
     EXPECT_EQ(Result::Done, result1.first);
     EXPECT_TRUE(result1.second.isEmpty());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest1->getPublicState());
     EXPECT_EQ(Result::Done, result2.first);
     EXPECT_TRUE(result2.second.isEmpty());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest2->getPublicState());
     EXPECT_FALSE(src->isCancelled());
 
     // Cancelling does nothing when closed.
     dest1->cancel();
     dest2->cancel();
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest1->getPublicState());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest2->getPublicState());
     EXPECT_FALSE(src->isCancelled());
 }
 
-TEST_F(BytesConsumerTeeTest, Read)
-{
-    ReplayingBytesConsumer* src = new ReplayingBytesConsumer(document());
-
-    src->add(Command(Command::Wait));
-    src->add(Command(Command::Data, "hello, "));
-    src->add(Command(Command::Wait));
-    src->add(Command(Command::Data, "world"));
-    src->add(Command(Command::Wait));
-    src->add(Command(Command::Wait));
-    src->add(Command(Command::Done));
-
-    BytesConsumer* dest1 = nullptr;
-    BytesConsumer* dest2 = nullptr;
-    BytesConsumer::tee(document(), src, &dest1, &dest2);
-
-    EXPECT_EQ(BytesConsumer::PublicState::ReadableOrWaiting, dest1->getPublicState());
-    EXPECT_EQ(BytesConsumer::PublicState::ReadableOrWaiting, dest2->getPublicState());
-
-    auto result1 = (new BytesConsumerTestUtil::Reader(dest1))->run();
-    auto result2 = (new BytesConsumerTestUtil::Reader(dest2))->run();
-
-    EXPECT_EQ(Result::Done, result1.first);
-    EXPECT_EQ("hello, world", toString(result1.second));
-    EXPECT_EQ(BytesConsumer::PublicState::Closed, dest1->getPublicState());
-    EXPECT_EQ(Result::Done, result2.first);
-    EXPECT_EQ("hello, world", toString(result2.second));
-    EXPECT_EQ(BytesConsumer::PublicState::Closed, dest2->getPublicState());
-    EXPECT_FALSE(src->isCancelled());
-}
-
 TEST_F(BytesConsumerTeeTest, TwoPhaseRead)
 {
     ReplayingBytesConsumer* src = new ReplayingBytesConsumer(document());
 
     src->add(Command(Command::Wait));
     src->add(Command(Command::Data, "hello, "));
     src->add(Command(Command::Wait));
     src->add(Command(Command::Data, "world"));
     src->add(Command(Command::Wait));
     src->add(Command(Command::Wait));
@@ skipping 184 matching lines @@
     TestClient* client = new TestClient();
     dest1->setClient(client);
 
     const char* buffer = nullptr;
     size_t available = 0;
     ASSERT_EQ(Result::Ok, dest1->beginRead(&buffer, &available));
     ASSERT_EQ(1u, available);
 
     EXPECT_EQ(BytesConsumer::PublicState::ReadableOrWaiting, dest1->getPublicState());
     int numOnStateChangeCalled = client->numOnStateChangeCalled();
-    EXPECT_EQ(Result::Error, (new BytesConsumerTestUtil::Reader(dest2))->run().first);
+    EXPECT_EQ(Result::Error, (new BytesConsumerTestUtil::TwoPhaseReader(dest2))->run().first);
     EXPECT_EQ(BytesConsumer::PublicState::Errored, dest1->getPublicState());
     EXPECT_EQ(numOnStateChangeCalled + 1, client->numOnStateChangeCalled());
     EXPECT_EQ('a', buffer[0]);
     EXPECT_EQ(Result::Ok, dest1->endRead(available));
 }
 
 TEST_F(BytesConsumerTeeTest, AsyncNotificationShouldBeDispatchedWhenAllDataIsConsumed)
 {
     ReplayingBytesConsumer* src = new ReplayingBytesConsumer(document());
     src->add(Command(Command::Data, "a"));
@@ skipping 56 matching lines @@
     EXPECT_EQ(0, client->numOnStateChangeCalled());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest1->getPublicState());
     testing::runPendingTasks();
     EXPECT_EQ(0, client->numOnStateChangeCalled());
     EXPECT_EQ(BytesConsumer::PublicState::Closed, dest1->getPublicState());
 }
 
 } // namespace
 
 } // namespace blink