Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp - Issue 512163002: ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (3/4)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

Issue 512163002: ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (3/4) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerContainer.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerRegistration.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

diff --git a/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp b/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

index 293181c7f50bf27c14c2027da858453d10e8835d..04b0ebf5f289470a43a2be5b179a8d119ccd6ae2 100644

--- a/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

+++ b/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

@@ -137,7 +137,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;

@@ -290,19 +290,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: