Revert of Reduce ActiveDOMObjects from modules/mediastream/

third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h

Index: third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h b/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h
index 2857ea3e13285e30a8877001cea3474462c9808e..d47014a30441094f4d279e8ac3f47610fde0e7b2 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h
+++ b/third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.h
@@ -26,7 +26,7 @@
 #ifndef RTCDTMFSender_h
 #define RTCDTMFSender_h
 
-#include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/ActiveDOMObject.h"
 #include "modules/EventTargetModules.h"
 #include "platform/Timer.h"
 #include "public/platform/WebRTCDTMFSenderHandlerClient.h"
@@ -41,7 +41,7 @@
 class RTCDTMFSender final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<RTCDTMFSender>
     , public WebRTCDTMFSenderHandlerClient
-    , public ContextLifecycleObserver {
+    , public ActiveDOMObject {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(RTCDTMFSender);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCDTMFSender);
     DEFINE_WRAPPERTYPEINFO();
@@ -65,7 +65,8 @@
     const AtomicString& interfaceName() const override;
     ExecutionContext* executionContext() const override;
 
-    void contextDestroyed() override;
+    // ActiveDOMObject
+    void stop() override;
 
     // Oilpan: need to eagerly finalize m_handler
     EAGERLY_FINALIZE();
@@ -86,6 +87,8 @@
 
     OwnPtr<WebRTCDTMFSenderHandler> m_handler;
 
+    bool m_stopped;
+
     Timer<RTCDTMFSender> m_scheduledEventTimer;
     WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
 };