| Index: Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp b/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp
|
| index aadc42a0e63dc22e366963484003b25c8b85e8f9..cb1983105ee9dba50a819cd7fada2e50bf2a303b 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp
|
| @@ -131,7 +131,7 @@ public:
|
| delete callbacks;
|
| }
|
|
|
| - virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
|
| + virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerUnregistrationCallbacks* callbacks) OVERRIDE
|
| {
|
| ADD_FAILURE() << "the provider should not be called to unregister a Service Worker";
|
| delete callbacks;
|
| @@ -284,19 +284,20 @@ private:
|
| m_owner.m_registerCallCount++;
|
| m_owner.m_registerScope = pattern;
|
| m_owner.m_registerScriptURL = scriptURL;
|
| - m_callbacksToDelete.append(adoptPtr(callbacks));
|
| + m_registrationCallbacksToDelete.append(adoptPtr(callbacks));
|
| }
|
|
|
| - virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
|
| + virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerUnregistrationCallbacks* callbacks) OVERRIDE
|
| {
|
| m_owner.m_unregisterCallCount++;
|
| m_owner.m_unregisterScope = pattern;
|
| - m_callbacksToDelete.append(adoptPtr(callbacks));
|
| + m_unregistrationCallbacksToDelete.append(adoptPtr(callbacks));
|
| }
|
|
|
| private:
|
| StubWebServiceWorkerProvider& m_owner;
|
| - Vector<OwnPtr<WebServiceWorkerRegistrationCallbacks> > m_callbacksToDelete;
|
| + Vector<OwnPtr<WebServiceWorkerRegistrationCallbacks> > m_registrationCallbacksToDelete;
|
| + Vector<OwnPtr<WebServiceWorkerUnregistrationCallbacks> > m_unregistrationCallbacksToDelete;
|
| };
|
|
|
| private:
|
|
|