Revert of Response construction with a ReadableStream

third_party/WebKit/Source/bindings/core/v8/ReadableStreamOperationsTest.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 "config.h"
 #include "bindings/core/v8/ReadableStreamOperations.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8IteratorResultValue.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "platform/heap/Handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <v8.h>
 
 namespace blink {
 
 namespace {
 
+// Unpacks |item|, stores the value of "done" member to |done| and returns
+// the value of "value" member. Returns an empty handle when errored.
+v8::MaybeLocal<v8::Value> unpack(ScriptState* scriptState, v8::Local<v8::Value> item, bool* done)
+{
+    if (!item->IsObject()) {
+        V8ThrowException::throwTypeError(scriptState->isolate(), "The iteration item is not an object.");
+        return v8::MaybeLocal<v8::Value>();
+    }
+    v8::Local<v8::Object> object = item.As<v8::Object>();
+    v8::Local<v8::Value> doneValue;
+    if (!v8Call(object->Get(scriptState->context(), v8String(scriptState->isolate(), "done")), doneValue))
+        return v8::MaybeLocal<v8::Value>();
+    v8::MaybeLocal<v8::Value> r = object->Get(scriptState->context(), v8String(scriptState->isolate(), "value"));
+    if (!r.IsEmpty())
+        *done = doneValue->ToBoolean()->Value();
+    return r;
+}
+
 class NotReached : public ScriptFunction {
 public:
     static v8::Local<v8::Function> createFunction(ScriptState* scriptState)
     {
         NotReached* self = new NotReached(scriptState);
         return self->bindToV8Function();
     }
 
 private:
     explicit NotReached(ScriptState* scriptState)
@@ skipping 16 matching lines @@
         : m_isSet(false)
         , m_isDone(false)
         , m_isValid(true) {}
 
     void set(ScriptValue v)
     {
         ASSERT(!v.isEmpty());
         m_isSet = true;
         v8::TryCatch block(v.scriptState()->isolate());
         v8::Local<v8::Value> value;
-        v8::Local<v8::Value> item = v.v8Value();
-        if (!item->IsObject() || !v8Call(v8UnpackIteratorResult(v.scriptState(), item.As<v8::Object>(), &m_isDone), value)) {
+        if (!v8Call(unpack(v.scriptState(), v.v8Value(), &m_isDone), value)) {
             m_isValid = false;
             return;
         }
         m_value = toCoreString(value->ToString());
     }
 
     bool isSet() const { return m_isSet; }
     bool isDone() const { return m_isDone; }
     bool isValid() const { return m_isValid; }
     const String& value() const { return m_value; }
@@ skipping 177 matching lines @@
     EXPECT_EQ("hello", it1->value());
     EXPECT_TRUE(it2->isSet());
     EXPECT_TRUE(it2->isValid());
     EXPECT_TRUE(it2->isDone());
 }
 
 } // namespace
 
 } // namespace blink