Have ScriptPromiseResolver on the Oilpan heap always.

Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

 // Copyright 2014 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 "config.h"
 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 32 matching lines @@
         return;
     }
 
     ASSERT_NOT_REACHED();
     return;
 }
 
 // This class allows MediaKeys to be set asynchronously.
 class SetMediaKeysHandler : public ScriptPromiseResolver {
     WTF_MAKE_NONCOPYABLE(SetMediaKeysHandler);
-
 public:
     static ScriptPromise create(ScriptState*, HTMLMediaElement&, MediaKeys*);
     ~SetMediaKeysHandler() override;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     SetMediaKeysHandler(ScriptState*, HTMLMediaElement&, MediaKeys*);
     void timerFired(Timer<SetMediaKeysHandler>*);
 
     void clearExistingMediaKeys();
     void setNewMediaKeys();
 
     void finish();
     void fail(ExceptionCode, const String& errorMessage);
 
     void clearFailed(ExceptionCode, const String& errorMessage);
     void setFailed(ExceptionCode, const String& errorMessage);
 
     // Keep media element alive until promise is fulfilled
     RefPtrWillBeMember<HTMLMediaElement> m_element;
-    PersistentWillBeMember<MediaKeys> m_newMediaKeys;
+    Member<MediaKeys> m_newMediaKeys;
     bool m_tookOwnership;
     Timer<SetMediaKeysHandler> m_timer;
 };
 
 typedef Function<void()> SuccessCallback;
 typedef Function<void(ExceptionCode, const String&)> FailureCallback;
 
 // Represents the result used when setContentDecryptionModule() is called.
 // Calls |success| if result is resolved, |failure| is result is rejected.
 class SetContentDecryptionModuleResult final : public ContentDecryptionModuleResult {
@@ skipping 35 matching lines @@
         (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), errorString);
     }
 
 private:
     OwnPtr<SuccessCallback> m_successCallback;
     OwnPtr<FailureCallback> m_failureCallback;
 };
 
 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
 {
-    RefPtrWillBeRawPtr<SetMediaKeysHandler> handler = adoptRefWillBeNoop(new SetMediaKeysHandler(scriptState, element, mediaKeys));
+    SetMediaKeysHandler* handler = new SetMediaKeysHandler(scriptState, element, mediaKeys);
     handler->suspendIfNeeded();
     handler->keepAliveWhilePending();
     return handler->promise();
 }
 
 SetMediaKeysHandler::SetMediaKeysHandler(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
     : ScriptPromiseResolver(scriptState)
     , m_element(element)
     , m_newMediaKeys(mediaKeys)
     , m_tookOwnership(false)
@@ skipping 482 matching lines @@
     return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0;
 }
 
 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
 {
     visitor->trace(m_mediaKeys);
     WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink