Have ScriptPromiseResolver on the Oilpan heap always.

Source/modules/navigatorconnect/ServicePortCollection.cpp

 // Copyright 2015 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/navigatorconnect/ServicePortCollection.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MessagePort.h"
 #include "core/events/MessageEvent.h"
 #include "modules/EventTargetModules.h"
 #include "modules/navigatorconnect/AcceptConnectionObserver.h"
 #include "modules/navigatorconnect/ServicePort.h"
 #include "modules/navigatorconnect/ServicePortConnectEvent.h"
 #include "modules/navigatorconnect/ServicePortConnectEventInit.h"
 #include "modules/navigatorconnect/ServicePortConnectOptions.h"
 #include "public/platform/Platform.h"
 #include "public/platform/modules/navigator_services/WebServicePortProvider.h"
 
 namespace blink {
 
 namespace {
 
 class ConnectCallbacks : public WebServicePortConnectCallbacks {
 public:
-    ConnectCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, ServicePortCollection* collection, const KURL& targetUrl, const String& portName, const String& serializedPortData)
+    ConnectCallbacks(ScriptPromiseResolver* resolver, ServicePortCollection* collection, const KURL& targetUrl, const String& portName, const String& serializedPortData)
         : m_resolver(resolver), m_collection(collection), m_targetUrl(targetUrl), m_portName(portName), m_serializedPortData(serializedPortData)
     {
         ASSERT(m_resolver);
     }
 
     ~ConnectCallbacks() override { }
 
     void onSuccess(WebServicePortID* portIdRaw) override
     {
         OwnPtr<WebServicePortID> webPortId = adoptPtr(portIdRaw);
@@ skipping 13 matching lines @@
     void onError() override
     {
         // TODO(mek): Pass actual error code back.
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped()) {
             return;
         }
         m_resolver->reject(DOMException::create(AbortError));
     }
 
 private:
-    RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
+    Persistent<ScriptPromiseResolver> m_resolver;
     Persistent<ServicePortCollection> m_collection;
     KURL m_targetUrl;
     String m_portName;
     String m_serializedPortData;
 
     WTF_MAKE_NONCOPYABLE(ConnectCallbacks);
 };
 
 } // namespace
 
@@ skipping 22 matching lines @@
 {
     if (!m_provider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     RefPtr<SerializedScriptValue> portData;
     if (options.hasData()) {
         portData = SerializedScriptValueFactory::instance().create(options.data().isolate(), options.data(), nullptr, exceptionState);
         if (exceptionState.hadException())
             return exceptionState.reject(scriptState);
     }
-    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     KURL targetUrl = scriptState->executionContext()->completeURL(url);
     m_provider->connect(
         targetUrl,
         scriptState->executionContext()->securityOrigin()->toString(),
         new ConnectCallbacks(resolver, this, targetUrl, options.name(), portData ? portData->toWireString() : String()));
     return promise;
 }
 
 ScriptPromise ServicePortCollection::match(ScriptState* scriptState, const ServicePortMatchOptions& options)
@@ skipping 50 matching lines @@
     ContextLifecycleObserver::trace(visitor);
 }
 
 ServicePortCollection::ServicePortCollection(ExecutionContext* context)
     : ContextLifecycleObserver(context)
     , m_provider(adoptPtr(Platform::current()->createServicePortProvider(this)))
 {
 }
 
 } // namespace blink