Rename WebServiceWorkerRegistry to WebServiceWorkerProvider

Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Index: Source/modules/serviceworkers/NavigatorServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
index 172589dabc8495c7d21d80b0122b92f60e03ac66..5b801f3f7c8be4e36efb70ff5db336fc2b3694c8 100644
--- a/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.cpp
@@ -41,10 +41,14 @@
 #include "core/workers/SharedWorker.h"
 #include "modules/serviceworkers/CallbackPromiseAdapter.h"
 #include "modules/serviceworkers/ServiceWorker.h"
-#include "public/platform/WebServiceWorkerRegistry.h"
+#include "public/platform/WebServiceWorkerProvider.h"
+#include "public/platform/WebServiceWorkerProviderClient.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 
+using WebKit::WebServiceWorkerProvider;
+using WebKit::WebString;
+
 namespace WebCore {
 
 NavigatorServiceWorker::NavigatorServiceWorker(Navigator* navigator)
@@ -61,6 +65,16 @@ const char* NavigatorServiceWorker::supplementName()
     return "NavigatorServiceWorker";
 }
 
+WebServiceWorkerProvider* NavigatorServiceWorker::serviceWorkerProvider()
+{
+    if (!m_provider) {
+        FrameLoaderClient* client = m_navigator->frame()->loader()->client();

[abarth-chromium, 2013/10/10 03:44:02]

m_navigator->frame() can be null.  What should we do in that case?

[alecflett, 2013/10/10 23:03:36]

Done.

+        // FIXME: This is temporarily hooked up here until we hook up to the loading process.
+        m_provider = adoptPtr(client->createServiceWorkerProvider(0));

[abarth-chromium, 2013/10/10 03:44:02]

We shouldn't be calling adoptPtr here.  Isntead, we should call adoptPtr
immediately after receiving the value over the API.  The rest of the functions
should work in terms of PassOwnPtr and OwnPtr.

[alecflett, 2013/10/10 23:03:36]

Done.

+    }
+    return m_provider.get();
+}
+
 NavigatorServiceWorker* NavigatorServiceWorker::from(Navigator* navigator)
 {
     NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator);
@@ -76,18 +90,16 @@ ScriptPromise NavigatorServiceWorker::registerServiceWorker(ScriptExecutionConte
     return from(navigator)->registerServiceWorker(context, pattern, url, es);
 }
 
-
 ScriptPromise NavigatorServiceWorker::registerServiceWorker(ScriptExecutionContext* scriptExecutionContext, const String& pattern, const String& scriptSrc, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
-    FrameLoaderClient* client = m_navigator->frame()->loader()->client();
     // WTF? Surely there's a better way to resolve a url?
     KURL scriptUrl = m_navigator->frame()->document()->completeURL(scriptSrc);
-    WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
 
-    if (peer)
-        peer->registerServiceWorker(pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
+    WebKit::WebServiceWorkerProvider* provider = serviceWorkerProvider();
+    if (provider)
+        provider->registerServiceWorker(scriptExecutionContext->url(), pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));

[abarth-chromium, 2013/10/10 03:44:02]

Why are you passing in the scriptExecutionContext->url() here instead of the
m_navigator->frame()->document()->url() ?  What do you do if
|scriptExecutionContext| and m_navigator->frame()->document() aren't the same
object?  Also, you're not handling the case where m_navigator->frame() is null.

     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
     // call here?
@@ -103,10 +115,10 @@ ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ScriptExecutionCon
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     FrameLoaderClient* client = m_navigator->frame()->loader()->client();
-    WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
+    WebKit::WebServiceWorkerProvider* provider = serviceWorkerProvider();
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
-    if (peer)
-        peer->unregisterServiceWorker(pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
+    if (provider)
+        provider->unregisterServiceWorker(scriptExecutionContext->url(), pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));

[abarth-chromium, 2013/10/10 03:44:02]

Again, why are you using the |scriptExecutionContext| for the context instead of
m_navigator->frame()->document() ?

     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
     return resolver->promise();