Revert of Reduce ActiveDOMObjects from modules/mediastream/

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

Index: third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h b/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h
index 2cb9276ed60e9ce03005469a42cdff26b4a2d054..8f4354ad7da4b5531c81698526b3f146cd366f71 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h
+++ b/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.h
@@ -27,7 +27,7 @@
 #define MediaDevicesRequest_h
 
 #include "bindings/core/v8/ScriptPromise.h"
-#include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/ActiveDOMObject.h"
 #include "modules/ModulesExport.h"
 #include "modules/mediastream/MediaDeviceInfo.h"
 #include "platform/heap/Handle.h"
@@ -41,11 +41,11 @@
 class ScriptState;
 class ScriptPromiseResolver;
 
-// TODO(haraken): Make this GarbageCollected once the WillBe type is removed.
-class MODULES_EXPORT MediaDevicesRequest final : public GarbageCollectedFinalized<MediaDevicesRequest>, public ContextLifecycleObserver {
+class MODULES_EXPORT MediaDevicesRequest final : public GarbageCollectedFinalized<MediaDevicesRequest>, public ActiveDOMObject {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaDevicesRequest);
 public:
     static MediaDevicesRequest* create(ScriptState*, UserMediaController*);
+    ~MediaDevicesRequest() override;
 
     Document* ownerDocument();
 
@@ -53,7 +53,8 @@
 
     void succeed(const MediaDeviceInfoVector&);
 
-    void contextDestroyed() override;
+    // ActiveDOMObject
+    void stop() override;
 
     DECLARE_VIRTUAL_TRACE();