ServiceWorker: Route unregister() through WebServiceWorkerRegistration for refactoring (1)

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"
@@ skipping 87 matching lines @@
 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;
     }
 
+#ifdef CRBUG_500404

[kinuko, 2015/06/16 00:37:54]

Why do we have these ifdef's in the same patch where we define it?

If we're going to spend 4 patches it doesn't look we need ifdef tricks, am I
missing something?

[nhiroki, 2015/06/16 01:03:49]

Right, this should be moved to the third CL. Done.

     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<bool, ServiceWorkerError>(resolver));
+#else
+    m_outerRegistration->unregister(m_provider, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
+#endif
     return promise;
 }
 
 ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
 {
     if (!outerRegistration)
         return 0;
 
     ServiceWorkerRegistration* existingRegistration = static_cast<ServiceWorkerRegistration*>(outerRegistration->proxy());
     if (existingRegistration) {
@@ skipping 42 matching lines @@
 
 void ServiceWorkerRegistration::stop()
 {
     if (m_stopped)
         return;
     m_stopped = true;
     m_outerRegistration->proxyStopped();
 }
 
 } // namespace blink