Revert of Reduce ActiveDOMObjects from core/

third_party/WebKit/Source/core/streams/ReadableStreamReader.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 "core/streams/ReadableStreamReader.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8IteratorResultValue.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/streams/ReadableStream.h"
 
 namespace blink {
 
 ReadableStreamReader::ReadableStreamReader(ExecutionContext* executionContext, ReadableStream* stream)
-    : ContextLifecycleObserver(executionContext)
+    : ActiveDOMObject(executionContext)
     , m_stream(stream)
     , m_closed(new ClosedPromise(executionContext, this, ClosedPromise::Closed))
 {
+    suspendIfNeeded();
     ASSERT(m_stream->isLockedTo(nullptr));
     m_stream->setReader(this);
 
     if (m_stream->stateInternal() == ReadableStream::Closed)
         m_closed->resolve(ToV8UndefinedGenerator());
     if (m_stream->stateInternal() == ReadableStream::Errored)
         m_closed->reject(m_stream->storedException());
 }
 
 ScriptPromise ReadableStreamReader::closed(ScriptState* scriptState)
@@ skipping 70 matching lines @@
     m_closed->reject(m_stream->storedException());
 }
 
 bool ReadableStreamReader::hasPendingActivity() const
 {
     // We need to extend ReadableStreamReader's wrapper's life while it is
     // active in order to call resolve / reject on ScriptPromiseProperties.
     return isActive() && m_stream->stateInternal() == ReadableStream::Readable;
 }
 
-void ReadableStreamReader::contextDestroyed()
+void ReadableStreamReader::stop()
 {
     if (isActive()) {
         // Calling |error| will release the lock.
         m_stream->error(DOMException::create(AbortError, "The frame stops working."));
     }
+    ActiveDOMObject::stop();
 }
 
 DEFINE_TRACE(ReadableStreamReader)
 {
     visitor->trace(m_stream);
     visitor->trace(m_closed);
-    ContextLifecycleObserver::trace(visitor);
+    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink