Use ScriptPromiseProperty::reset in ReadableStream.

Source/core/streams/ReadableStreamTest.cpp

 // Copyright 2014 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 "core/streams/ReadableStream.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 367 matching lines @@
     EXPECT_TRUE(onFulfilled.isNull());
     EXPECT_TRUE(onRejected.isNull());
 
     isolate()->RunMicrotasks();
     EXPECT_EQ("undefined", onFulfilled);
     EXPECT_TRUE(onRejected.isNull());
 
     stream->error(DOMException::create(NotFoundError, "error"));
     EXPECT_EQ(ReadableStream::Errored, stream->state());
 
-    // FIXME: This expectation should hold but doesn't because of
-    // a ScriptPromiseProperty bug. Enable it when the defect is fixed.
-    // EXPECT_NE(promise, stream->wait(scriptState()));
+    EXPECT_NE(promise, stream->wait(scriptState()));
 }
 
 TEST_F(ReadableStreamTest, CloseWhenWaiting)
 {
     String onWaitFulfilled, onWaitRejected;
     String onClosedFulfilled, onClosedRejected;
 
     StringStream* stream = construct();
 
     {
@@ skipping 107 matching lines @@
     checkpoint.Call(1);
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ("hello", chunk);
     EXPECT_EQ(ReadableStream::Waiting, stream->state());
     EXPECT_TRUE(stream->isPulling());
     EXPECT_FALSE(stream->isDraining());
 
     ScriptPromise newPromise = stream->wait(scriptState());
     newPromise.then(createCaptor(&onFulfilled), createCaptor(&onRejected));
     isolate()->RunMicrotasks();
-    // FIXME: Uncomment the following assertions once
-    // |ScriptPromiseProperty.reset| is implemented and used.
-    // EXPECT_NE(promise, newPromise);
-    // EXPECT_TRUE(onFulfilled.isNull());
-    // EXPECT_TRUE(onRejected.isNull());
+    EXPECT_NE(promise, newPromise);
+    EXPECT_TRUE(onFulfilled.isNull());
+    EXPECT_TRUE(onRejected.isNull());
 }
 
 TEST_F(ReadableStreamTest, EnqueTwiceAndRead)
 {
     StringStream* stream = construct();
     Checkpoint checkpoint;
 
     {
         InSequence s;
         EXPECT_CALL(checkpoint, Call(0));
@@ skipping 45 matching lines @@
     isolate()->RunMicrotasks();
 
     EXPECT_EQ(ReadableStream::Readable, stream->state());
     EXPECT_FALSE(stream->isPulling());
     EXPECT_TRUE(stream->isDraining());
 
     EXPECT_TRUE(stream->read(scriptState(), &m_exceptionState).toString(chunk));
     EXPECT_EQ("bye", chunk);
     EXPECT_FALSE(m_exceptionState.hadException());
 
-    // FIXME: This assertion should be enabled once
-    // ScriptPromiseProperty.reset is implemented and used.
-    // EXPECT_NE(promise, stream->wait(scriptState()));
+    EXPECT_NE(promise, stream->wait(scriptState()));
     stream->wait(scriptState()).then(createCaptor(&onWaitFulfilled), createCaptor(&onWaitRejected));
 
     EXPECT_EQ(ReadableStream::Closed, stream->state());
     EXPECT_FALSE(stream->isPulling());
     EXPECT_TRUE(stream->isDraining());
 
     EXPECT_TRUE(onWaitFulfilled.isNull());
     EXPECT_TRUE(onWaitRejected.isNull());
     EXPECT_TRUE(onClosedFulfilled.isNull());
     EXPECT_TRUE(onClosedRejected.isNull());
@@ skipping 82 matching lines @@
         InSequence s;
         EXPECT_CALL(*m_underlyingSource, cancelSource(scriptState(), reason)).WillOnce(Return(promise));
     }
 
     stream->enqueue("hello");
     ScriptPromise wait = stream->wait(scriptState());
     EXPECT_EQ(ReadableStream::Readable, stream->state());
     EXPECT_EQ(promise, stream->cancel(scriptState(), reason));
     EXPECT_EQ(ReadableStream::Closed, stream->state());
 
-    // FIXME: Uncomment this once ScriptPromiseProperty::reset is implemented
-    // and used.
-    // EXPECT_NE(stream->wait(scriptState()), wait);
+    EXPECT_NE(stream->wait(scriptState()), wait);
 
     stream->wait(scriptState()).then(createCaptor(&onFulfilled), createCaptor(&onRejected));
     EXPECT_TRUE(onFulfilled.isNull());
     EXPECT_TRUE(onRejected.isNull());
 
     isolate()->RunMicrotasks();
     EXPECT_EQ("undefined", onFulfilled);
     EXPECT_TRUE(onRejected.isNull());
 }
 
 TEST_F(ReadableStreamTest, ReadableArrayBufferCompileTest)
 {
     // This test tests if ReadableStreamImpl<ArrayBuffer> can be instantiated.
     {
         InSequence s;
         EXPECT_CALL(*m_underlyingSource, startSource(&m_exceptionState)).WillOnce(Return(ScriptPromise()));
     }
 
     new ReadableStreamImpl<ReadableStreamChunkTypeTraits<ArrayBuffer> >(scriptState(), m_underlyingSource, &m_exceptionState);
 }
 
 } // namespace blink