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

Source/modules/serviceworkers/ServiceWorkerRegistration.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 "ServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #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 {
 
 class BooleanValue {
 public:
     typedef bool WebType;
     static bool take(ScriptPromiseResolver* resolver, WebType* boolean)
     {
         return *boolean;
     }
@@ skipping 67 matching lines @@
 String ServiceWorkerRegistration::scope() const
 {
     return m_outerRegistration->scope().string();
 }
 
 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();
     if (!scope().isEmpty() && !documentOrigin->canRequest(scopeURL)) {
         RefPtr<SecurityOrigin> scopeOrigin = SecurityOrigin::create(scopeURL);
         resolver->reject(DOMException::create(SecurityError, "Failed to unregister a ServiceWorkerRegistration: The origin of the registration's scope ('" + scopeOrigin->toString() + "') does not match the current origin ('" + documentOrigin->toString() + "')."));
         return promise;
     }
 
-    m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
+    m_outerRegistration->unregister(new CallbackPromiseAdapter<BooleanValue, ServiceWorkerError>(resolver));
     return promise;
 }
 
 ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
 {
     if (!outerRegistration)
         return 0;
 
     ServiceWorkerRegistration* existingRegistration = static_cast<ServiceWorkerRegistration*>(outerRegistration->proxy());
     if (existingRegistration) {
         ASSERT(existingRegistration->executionContext() == executionContext);
         return existingRegistration;
     }
 
     ServiceWorkerRegistration* registration = new ServiceWorkerRegistration(executionContext, adoptPtr(outerRegistration));
     registration->suspendIfNeeded();
     return registration;
 }
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
     : ActiveDOMObject(executionContext)
     , m_outerRegistration(outerRegistration)
-    , m_provider(0)
     , m_stopped(false)
 {
     ASSERT(m_outerRegistration);
     ThreadState::current()->registerPreFinalizer(*this);
 
     if (!executionContext)
         return;
-    if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext))
-        m_provider = client->provider();
     m_outerRegistration->setProxy(this);
 }
 
 ServiceWorkerRegistration::~ServiceWorkerRegistration()
 {
     ASSERT(!m_outerRegistration);
 }
 
 void ServiceWorkerRegistration::dispose()
 {
@@ skipping 18 matching lines @@
 
 void ServiceWorkerRegistration::stop()
 {
     if (m_stopped)
         return;
     m_stopped = true;
     m_outerRegistration->proxyStopped();
 }
 
 } // namespace blink