ServiceWorker: Clean up ownership management of WebServiceWorkerRegistration

Source/modules/serviceworkers/ServiceWorkerGlobalScope.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 136 matching lines @@
     if (!executionContext)
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     ServiceWorkerGlobalScopeClient::from(executionContext)->skipWaiting(new SkipWaitingCallback(resolver));
     return promise;
 }
 
-void ServiceWorkerGlobalScope::setRegistration(WebServiceWorkerRegistration* registration)
+void ServiceWorkerGlobalScope::setRegistration(WebServiceWorkerRegistration* registrationRaw)
 {
-    if (!executionContext()) {
-        ServiceWorkerRegistration::dispose(registration);
+    ASSERT(registrationRaw);
+    OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
+    if (!executionContext())
         return;
-    }
-    m_registration = ServiceWorkerRegistration::from(executionContext(), registration);
+    m_registration = ServiceWorkerRegistration::create(executionContext(), registration.release());
 }
 
 bool ServiceWorkerGlobalScope::addEventListener(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener> listener, bool useCapture)
 {
     if (m_didEvaluateScript) {
         if (eventType == EventTypeNames::install) {
             RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'install' event must be added on the initial evaluation of worker script.");
             addMessageToWorkerConsole(consoleMessage.release());
         } else if (eventType == EventTypeNames::activate) {
             RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "Event handler of 'activate' event must be added on the initial evaluation of worker script.");
@@ skipping 62 matching lines @@
 }
 
 void ServiceWorkerGlobalScope::scriptLoaded(size_t scriptSize, size_t cachedMetadataSize)
 {
     ++m_scriptCount;
     m_scriptTotalSize += scriptSize;
     m_scriptCachedMetadataTotalSize += cachedMetadataSize;
 }
 
 } // namespace blink