Reduce SuspendableObjects

third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h

Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h
index 79fdd0c0c593211f7e83e52c484eba5918e1ee95..3b5eeb6b859a9c5eac797154f01b7a87c0ea3e1e 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h
@@ -29,8 +29,8 @@
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/DOMArrayPiece.h"
-#include "core/dom/SuspendableObject.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebEncryptedMediaTypes.h"
@@ -53,7 +53,7 @@ class WebContentDecryptionModule;
 // The WebContentDecryptionModule has the same lifetime as this object.
 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>,
                   public ActiveScriptWrappable<MediaKeys>,
-                  public SuspendableObject,
+                  public ContextLifecycleObserver,
                   public ScriptWrappable {
   USING_GARBAGE_COLLECTED_MIXIN(MediaKeys);
   DEFINE_WRAPPERTYPEINFO();
@@ -63,7 +63,7 @@ class MediaKeys : public GarbageCollectedFinalized<MediaKeys>,
       ExecutionContext*,
       const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
       std::unique_ptr<WebContentDecryptionModule>);
-  ~MediaKeys() override;
+  virtual ~MediaKeys();
 
   MediaKeySession* createSession(ScriptState*,
                                  const String& sessionTypeString,
@@ -92,7 +92,7 @@ class MediaKeys : public GarbageCollectedFinalized<MediaKeys>,
 
   DECLARE_VIRTUAL_TRACE();
 
-  // SuspendableObject implementation.
+  // ContextLifecycleObserver implementation.
   // FIXME: This class could derive from ContextLifecycleObserver
   // again (http://crbug.com/483722).
   void contextDestroyed() override;