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

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

Issue 2724243003: Revert of [ServiceWorker] Mojofy ActivateEvent of Service Worker (Closed)
Patch Set: Created 3 years, 10 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_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
index 96c014ab948a57477ba7c9c7eac21c0a1ee45e70..fb6924c9846fa472e1fa7ff49ac565e0286856e9 100644
--- a/content/browser/service_worker/service_worker_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -106,18 +106,6 @@
return base::Bind(&SaveUnregistrationCallback, expected_status, called);
}
-ServiceWorkerStatusCode EventResultToStatus(
- blink::WebServiceWorkerEventResult result) {
- switch (result) {
- case blink::WebServiceWorkerEventResultCompleted:
- return SERVICE_WORKER_OK;
- case blink::WebServiceWorkerEventResultRejected:
- return SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
- }
- NOTREACHED() << "Got invalid result: " << result;
- return SERVICE_WORKER_ERROR_FAILED;
-}
-
} // namespace
class ServiceWorkerJobTest : public testing::Test {
@@ -1472,12 +1460,10 @@
embedded_worker_id, request_id, install_event_result_,
has_fetch_handler_, base::Time::Now()));
}
-
- void OnActivateEvent(
- const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
- callback) override {
- callback.Run(EventResultToStatus(activate_event_result_),
- base::Time::Now());
+ void OnActivateEvent(int embedded_worker_id, int request_id) override {
+ SimulateSend(new ServiceWorkerHostMsg_ActivateEventFinished(
+ embedded_worker_id, request_id, activate_event_result_,
+ base::Time::Now()));
}
void set_install_callback(const base::Closure& callback) {

Powered by Google App Engine
This is Rietveld 408576698