[WONT COMMIT] ServiceWorker: Move unregister function from WebSWProvider to WebSWRegistration (3/3)

Source/modules/serviceworkers/ServiceWorkerRegistration.cpp

Index: Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
index 2771047dc03fc86c4bdd0ef9c6db7d96b6de1af3..0614617e23340a7d2c197db17f7d69c15c363f15 100644
--- a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
@@ -14,9 +14,7 @@
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "modules/EventTargetModules.h"
-#include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
-#include "public/platform/WebServiceWorkerProvider.h"
 
 namespace blink {
 
@@ -104,11 +102,6 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    if (!m_provider) {
-        resolver->reject(DOMException::create(InvalidStateError, "Failed to unregister a ServiceWorkerRegistration: No associated provider is available."));
-        return promise;
-    }
-
     RefPtr<SecurityOrigin> documentOrigin = scriptState->executionContext()->securityOrigin();
     KURL scopeURL = scriptState->executionContext()->completeURL(scope());
     scopeURL.removeFragmentIdentifier();
@@ -118,7 +111,7 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
         return promise;
     }
 
-    m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
+    m_outerRegistration->unregister(new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
     return promise;
 }
 
@@ -141,7 +134,6 @@ ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionConte
 ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
     : ActiveDOMObject(executionContext)
     , m_outerRegistration(outerRegistration)
-    , m_provider(0)
     , m_stopped(false)
 {
     ASSERT(m_outerRegistration);
@@ -149,8 +141,6 @@ ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* execution
 
     if (!executionContext)
         return;
-    if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext))
-        m_provider = client->provider();
     m_outerRegistration->setProxy(this);
 }