content/browser/service_worker/service_worker_dispatcher_host.cc - Issue 554573002: SWRegistration::unregister returns false when the registration is already unregistered. (2/3)

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: content/browser/service_worker/service_worker_dispatcher_host.cc

Issue 554573002: SWRegistration::unregister returns false when the registration is already unregistered. (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add const 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 | « content/browser/service_worker/service_worker_browsertest.cc ('k') | content/browser/service_worker/service_worker_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_dispatcher_host.cc

diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc

index a0bdabf61db8196e2f0104d6e715dfa67d828a11..dfcaa8e673d945f4074bc199909fc7174b49a93f 100644

--- a/content/browser/service_worker/service_worker_dispatcher_host.cc

+++ b/content/browser/service_worker/service_worker_dispatcher_host.cc

@@ -595,12 +595,14 @@ void ServiceWorkerDispatcherHost::UnregistrationComplete(

int thread_id,

int request_id,

ServiceWorkerStatusCode status) {

- if (status != SERVICE_WORKER_OK) {

+ if (status != SERVICE_WORKER_OK && status != SERVICE_WORKER_ERROR_NOT_FOUND) {

SendUnregistrationError(thread_id, request_id, status);

return;

}

- Send(new ServiceWorkerMsg_ServiceWorkerUnregistered(thread_id, request_id));

+ const bool is_success = (status == SERVICE_WORKER_OK);

+ Send(new ServiceWorkerMsg_ServiceWorkerUnregistered(thread_id,

+ request_id,

+ is_success));

TRACE_EVENT_ASYNC_END1(

"ServiceWorker",

"ServiceWorkerDispatcherHost::UnregisterServiceWorker",