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

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 fa2e56abbbcb5d4a88df622dca4f2ff30eac51fb..075df32fb49f2a1d049eab5c8305ad93a79ee9dc 100644
--- a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
@@ -105,6 +105,7 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
         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();
@@ -115,6 +116,9 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
     }
 
     m_provider->unregisterServiceWorker(scopeURL, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
+#else
+    m_outerRegistration->unregister(m_provider, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
+#endif
     return promise;
 }