Remove BytesConsumer::read

third_party/WebKit/Source/modules/fetch/BytesConsumerTestUtil.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/BytesConsumerTestUtil.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/WebTaskRunner.h"
@@ skipping 131 matching lines @@
     ++m_notificationToken;
 }
 
 DEFINE_TRACE(BytesConsumerTestUtil::ReplayingBytesConsumer)
 {
     visitor->trace(m_executionContext);
     visitor->trace(m_client);
     BytesConsumer::trace(visitor);
 }
 
-BytesConsumerTestUtil::Reader::Reader(BytesConsumer* consumer)
-    : m_consumer(consumer)
-{
-    m_consumer->setClient(this);
-}
-
-void BytesConsumerTestUtil::Reader::onStateChange()
-{
-    while (true) {
-        // We choose 3 here because of the following reasons.
-        //  - We want to split a string with multiple chunks, so we need to
-        //    choose a small number.
-        //  - An odd number is preferable to check an out-of-range error.
-        //  - With 1, every chunk consists of one byte it's too simple.
-        char buffer[3];
-        size_t read = 0;
-        switch (m_consumer->read(buffer, sizeof(buffer), &read)) {
-        case BytesConsumer::Result::Ok:
-            m_data.append(buffer, read);
-            break;
-        case BytesConsumer::Result::ShouldWait:
-            return;
-        case BytesConsumer::Result::Done:
-            m_result = BytesConsumer::Result::Done;
-            return;
-        case BytesConsumer::Result::Error:
-            m_result = BytesConsumer::Result::Error;
-            return;
-        }
-    }
-}
-
-std::pair<BytesConsumer::Result, Vector<char>> BytesConsumerTestUtil::Reader::run()
-{
-    onStateChange();
-    while (m_result != BytesConsumer::Result::Done && m_result != BytesConsumer::Result::Error)
-        testing::runPendingTasks();
-    testing::runPendingTasks();
-    return std::make_pair(m_result, std::move(m_data));
-}
-
 BytesConsumerTestUtil::TwoPhaseReader::TwoPhaseReader(BytesConsumer* consumer)
     : m_consumer(consumer)
 {
     m_consumer->setClient(this);
 }
 
 
 void BytesConsumerTestUtil::TwoPhaseReader::onStateChange()
 {
     while (true) {
         const char* buffer = nullptr;
         size_t available = 0;
         switch (m_consumer->beginRead(&buffer, &available)) {
         case BytesConsumer::Result::Ok: {
             // We don't use |available| as-is to test cases where endRead
             // is called with a number smaller than |available|. We choose 3
             // because of the same reasons as Reader::onStateChange.
-            size_t read = std::max(static_cast<size_t>(3), available);
+            size_t read = std::min(static_cast<size_t>(3), available);

[yhirano, 2016/09/20 08:44:41]

This is a separate bug. I found this bug in the process of this refactoring.
Since it's a small one let me fix this bug in this CL.

             m_data.append(buffer, read);
             if (m_consumer->endRead(read) != BytesConsumer::Result::Ok) {
                 m_result = BytesConsumer::Result::Error;
                 return;
             }
             break;
         }
         case BytesConsumer::Result::ShouldWait:
             return;
         case BytesConsumer::Result::Done:
             m_result = BytesConsumer::Result::Done;
             return;
         case BytesConsumer::Result::Error:
             m_result = BytesConsumer::Result::Error;
             return;
         }
     }
 }
 
 std::pair<BytesConsumer::Result, Vector<char>> BytesConsumerTestUtil::TwoPhaseReader::run()
 {
     onStateChange();
     while (m_result != BytesConsumer::Result::Done && m_result != BytesConsumer::Result::Error)
         testing::runPendingTasks();
     testing::runPendingTasks();
     return std::make_pair(m_result, std::move(m_data));
 }
 
 } // namespace blink