| 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 c7bf99e755e1302d3de6e7808c3dabbe2289dba3..639b3cb20a35943022bdcd93f457f4952ec07691 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
|
| @@ -364,12 +364,12 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| - embedded_worker_id, response_id,
|
| + embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| ServiceWorkerResponse(
|
| GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault,
|
| @@ -447,11 +447,11 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| - embedded_worker_id, response_id,
|
| + embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| ServiceWorkerResponse(
|
| GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault,
|
| @@ -529,11 +529,11 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| - embedded_worker_id, response_id,
|
| + embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| ServiceWorkerResponse(
|
| GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault,
|
| @@ -842,7 +842,7 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| SimulateWorkerStopped(embedded_worker_id);
|
| @@ -954,12 +954,12 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| callback_ = callback;
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| - embedded_worker_id, response_id,
|
| + embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| ServiceWorkerResponse(
|
| GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault,
|
| @@ -1013,7 +1013,7 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
|
|
|
| void Respond() {
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| - embedded_worker_id_, response_id_,
|
| + embedded_worker_id_, fetch_event_id_,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| ServiceWorkerResponse(
|
| GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault,
|
| @@ -1028,17 +1028,17 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
|
|
|
| protected:
|
| void OnFetchEvent(int embedded_worker_id,
|
| - int response_id,
|
| + int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| const FetchCallback& callback) override {
|
| embedded_worker_id_ = embedded_worker_id;
|
| - response_id_ = response_id;
|
| + fetch_event_id_ = fetch_event_id;
|
| callback_ = callback;
|
| }
|
|
|
| private:
|
| int embedded_worker_id_ = 0;
|
| - int response_id_ = 0;
|
| + int fetch_event_id_ = 0;
|
| FetchCallback callback_;
|
| DISALLOW_COPY_AND_ASSIGN(DelayedResponseHelper);
|
| };
|
|
|