CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3).

Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
             return;
         m_resolver->resolve(ServiceWorkerRegistration::take(m_resolver.get(), registration));
     }
 
     // Takes ownership of |errorRaw|.
     void onError(WebServiceWorkerError* errorRaw) override
     {
         OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));
+        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
     }
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
     WTF_MAKE_NONCOPYABLE(RegistrationCallback);
 };
 
 class GetRegistrationCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationCallbacks {
 public:
     explicit GetRegistrationCallback(ScriptPromiseResolver* resolver)
@@ skipping 11 matching lines @@
         }
         m_resolver->resolve(ServiceWorkerRegistration::take(m_resolver.get(), registration));
     }
 
     // Takes ownership of |errorRaw|.
     void onError(WebServiceWorkerError* errorRaw) override
     {
         OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));
+        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
     }
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
     WTF_MAKE_NONCOPYABLE(GetRegistrationCallback);
 };
 
 class GetRegistrationsCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationsCallbacks {
 public:
     explicit GetRegistrationsCallback(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
     ~GetRegistrationsCallback() override { }
 
     // Takes ownership of |registrationsRaw|.
     void onSuccess(WebVector<WebServiceWorkerRegistration*>* registrationsRaw) override
     {
         OwnPtr<WebVector<WebServiceWorkerRegistration*>> registrations = adoptPtr(registrationsRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->resolve(ServiceWorkerRegistrationArray::take(m_resolver.get(), registrations.release()));
     }
 
     // Takes ownership of |errorRaw|.
     void onError(WebServiceWorkerError* errorRaw) override
     {
         OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));
+        m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
     }
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
     WTF_MAKE_NONCOPYABLE(GetRegistrationsCallback);
 };
 
 class ServiceWorkerContainer::GetRegistrationForReadyCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationForReadyCallbacks {
 public:
     explicit GetRegistrationForReadyCallback(ReadyProperty* ready)
@@ skipping 239 matching lines @@
         return;
 
     if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
         m_provider = client->provider();
         if (m_provider)
             m_provider->setClient(this);
     }
 }
 
 } // namespace blink