Remove ContextLifecycleObserver from RemotePlayback

third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.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/remoteplayback/RemotePlayback.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/modules/v8/RemotePlaybackAvailabilityCallback.h"
 #include "core/HTMLNames.h"
 #include "core/dom/DOMException.h"
@@ skipping 29 matching lines @@
 
 }  // anonymous namespace
 
 // static
 RemotePlayback* RemotePlayback::create(HTMLMediaElement& element) {
   return new RemotePlayback(element);
 }
 
 RemotePlayback::RemotePlayback(HTMLMediaElement& element)
     : ActiveScriptWrappable(this),
-      ContextLifecycleObserver(&element.document()),
       m_state(element.isPlayingRemotely()
                   ? WebRemotePlaybackState::Connected
                   : WebRemotePlaybackState::Disconnected),
       m_availability(WebRemotePlaybackAvailability::Unknown),
       m_mediaElement(&element) {}
 
 const AtomicString& RemotePlayback::interfaceName() const {
   return EventTargetNames::RemotePlayback;
 }
 
@@ skipping 134 matching lines @@
   }
 
   return promise;
 }
 
 String RemotePlayback::state() const {
   return remotePlaybackStateToString(m_state);
 }
 
 bool RemotePlayback::hasPendingActivity() const {
+  // TODO(haraken): This check should be moved to ActiveScriptWrappable.
+  if (getExecutionContext()->isContextDestroyed())
+    return false;
   return hasEventListeners() || !m_availabilityCallbacks.isEmpty() ||
          m_promptPromiseResolver;
 }
 
-void RemotePlayback::contextDestroyed() {
-  m_availabilityCallbacks.clear();
-  m_promptPromiseResolver = nullptr;
-}
-
 void RemotePlayback::notifyInitialAvailability(int callbackId) {
   // May not find the callback if the website cancels it fast enough.
   auto iter = m_availabilityCallbacks.find(callbackId);
   if (iter == m_availabilityCallbacks.end())
     return;
 
   iter->value->call(this, remotePlaybackAvailable());
 }
 
 void RemotePlayback::stateChanged(WebRemotePlaybackState state) {
@@ skipping 79 matching lines @@
     const v8::Persistent<v8::Object>& wrapper) {
   for (auto callback : m_availabilityCallbacks.values())
     callback->setWrapperReference(isolate, wrapper);
 }
 
 DEFINE_TRACE(RemotePlayback) {
   visitor->trace(m_availabilityCallbacks);
   visitor->trace(m_promptPromiseResolver);
   visitor->trace(m_mediaElement);
   EventTargetWithInlineData::trace(visitor);
-  ContextLifecycleObserver::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(RemotePlayback) {
   for (auto callback : m_availabilityCallbacks.values()) {
     visitor->traceWrappers(callback);
   }
   EventTargetWithInlineData::traceWrappers(visitor);
 }
 
 }  // namespace blink