Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2746783002: [ServiceWorker] Mojofy InstallEvent of Service Worker (Closed)
Patch Set: Created 3 years, 9 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
Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 1fdc638be2f9bc68b4c64fec2d8bf058e3e49212..9dda142de6ee1a016c4d1e0b0afb623c2e23254c 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -726,32 +726,24 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
int request_id =
version_->StartRequest(ServiceWorkerMetrics::EventType::INSTALL,
CreateReceiver(BrowserThread::UI, done, result));
- version_
- ->RegisterRequestCallback<ServiceWorkerHostMsg_InstallEventFinished>(
- request_id, base::Bind(&self::ReceiveInstallEventOnIOThread,
- base::Unretained(this), done, result));
- version_->DispatchEvent({request_id},
- ServiceWorkerMsg_InstallEvent(request_id));
+ version_->event_dispatcher()->DispatchInstallEvent(
+ base::Bind(&self::ReceiveInstallEventOnIOThread, base::Unretained(this),
+ done, result, request_id));
}
void ReceiveInstallEventOnIOThread(const base::Closure& done,
ServiceWorkerStatusCode* out_result,
int request_id,
- blink::WebServiceWorkerEventResult result,
+ ServiceWorkerStatusCode status,
bool has_fetch_handler,
base::Time dispatch_event_time) {
- version_->FinishRequest(
- request_id, result == blink::WebServiceWorkerEventResultCompleted,
- dispatch_event_time);
+ version_->FinishRequest(request_id, status == SERVICE_WORKER_OK,
+ dispatch_event_time);
version_->set_fetch_handler_existence(
has_fetch_handler
? ServiceWorkerVersion::FetchHandlerExistence::EXISTS
: ServiceWorkerVersion::FetchHandlerExistence::DOES_NOT_EXIST);
- ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
- if (result == blink::WebServiceWorkerEventResultRejected)
- status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
-
*out_result = status;
if (!done.is_null())
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done);

Powered by Google App Engine
This is Rietveld 408576698