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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2352173004: Mojoify FetchEvent of Service Worker. (Closed)
Patch Set: incorporated dcheng's comment Created 4 years, 2 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_fetch_dispatcher.cc ('k') | content/browser/service_worker/service_worker_version_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index bd63bb08fd253c8ee66e06c070d47ac72c2473fd..6c9afc6e64599f5a7adde1d43f72e5edcd341d98 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -33,6 +33,7 @@
#include "content/browser/streams/stream_registry.h"
#include "content/common/resource_request_body_impl.h"
#include "content/common/service_worker/service_worker_messages.h"
+#include "content/common/service_worker/service_worker_status_code.h"
#include "content/public/browser/blob_handle.h"
#include "content/public/common/request_context_frame_type.h"
#include "content/public/common/request_context_type.h"
@@ -363,8 +364,8 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
embedded_worker_id, response_id,
@@ -377,9 +378,7 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
std::string() /* response_cache_storage_cache_name */,
ServiceWorkerHeaderList() /* cors_exposed_header_names */),
base::Time::Now()));
- SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
- embedded_worker_id, event_finish_id,
- blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+ callback.Run(SERVICE_WORKER_OK, base::Time::Now());
}
private:
@@ -448,8 +447,8 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
embedded_worker_id, response_id,
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -461,9 +460,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
std::string() /* response_cache_storage_cache_name */,
ServiceWorkerHeaderList() /* cors_exposed_header_names */),
base::Time::Now()));
- SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
- embedded_worker_id, event_finish_id,
- blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+ callback.Run(SERVICE_WORKER_OK, base::Time::Now());
}
std::string blob_uuid_;
@@ -532,8 +529,8 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
embedded_worker_id, response_id,
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -545,9 +542,7 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
std::string() /* response_cache_storage_cache_name */,
ServiceWorkerHeaderList() /* cors_exposed_header_names */),
base::Time::Now()));
- SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
- embedded_worker_id, event_finish_id,
- blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+ callback.Run(SERVICE_WORKER_OK, base::Time::Now());
}
const GURL stream_url_;
@@ -847,9 +842,10 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
SimulateWorkerStopped(embedded_worker_id);
+ callback.Run(SERVICE_WORKER_ERROR_ABORT, base::Time::Now());
}
private:
@@ -952,18 +948,15 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
~EarlyResponseHelper() override {}
void FinishWaitUntil() {
- SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
- embedded_worker_id_, event_finish_id_,
- blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+ callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
}
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
- embedded_worker_id_ = embedded_worker_id;
- event_finish_id_ = event_finish_id;
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
+ callback_ = callback;
SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
embedded_worker_id, response_id,
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -978,8 +971,7 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
}
private:
- int embedded_worker_id_ = 0;
- int event_finish_id_ = 0;
+ FetchCallback callback_;
DISALLOW_COPY_AND_ASSIGN(EarlyResponseHelper);
};
@@ -1008,6 +1000,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, EarlyResponse) {
EXPECT_TRUE(version_->HasWork());
helper->FinishWaitUntil();
+ base::RunLoop().RunUntilIdle();
EXPECT_FALSE(version_->HasWork());
}
@@ -1029,25 +1022,23 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
std::string() /* response_cache_storage_cache_name */,
ServiceWorkerHeaderList() /* cors_exposed_header_names */),
base::Time::Now()));
- SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
- embedded_worker_id_, event_finish_id_,
- blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+ callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
}
protected:
void OnFetchEvent(int embedded_worker_id,
int response_id,
- int event_finish_id,
- const ServiceWorkerFetchRequest& request) override {
+ const ServiceWorkerFetchRequest& request,
+ const FetchCallback& callback) override {
embedded_worker_id_ = embedded_worker_id;
response_id_ = response_id;
- event_finish_id_ = event_finish_id;
+ callback_ = callback;
}
private:
int embedded_worker_id_ = 0;
int response_id_ = 0;
- int event_finish_id_ = 0;
+ FetchCallback callback_;
DISALLOW_COPY_AND_ASSIGN(DelayedResponseHelper);
};
« no previous file with comments | « content/browser/service_worker/service_worker_fetch_dispatcher.cc ('k') | content/browser/service_worker/service_worker_version_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698