Chromium Code Reviews| Index: content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| index b9384de0d22ea89b0c0da43b32d6605d3641f527..ec258bb479a50f3c7541a9bc5f5a9de9c0361648 100644 |
| --- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| @@ -18,7 +18,7 @@ |
| #include "content/browser/loader/url_loader_factory_impl.h" |
| #include "content/browser/service_worker/embedded_worker_status.h" |
| #include "content/browser/service_worker/service_worker_version.h" |
| -#include "content/common/service_worker/fetch_event_dispatcher.mojom.h" |
| +#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h" |
| #include "content/common/service_worker/service_worker_messages.h" |
| #include "content/common/service_worker/service_worker_status_code.h" |
| #include "content/common/service_worker/service_worker_types.h" |
| @@ -292,15 +292,12 @@ void ServiceWorkerFetchDispatcher::DispatchFetchEvent() { |
| base::Bind(&ServiceWorkerFetchDispatcher::ResponseCallback::Run, |
| base::Owned(response_callback))); |
| - base::WeakPtr<mojom::FetchEventDispatcher> dispatcher = |
| - version_->GetMojoServiceForRequest<mojom::FetchEventDispatcher>( |
| - event_finish_id); |
| // |dispatcher| is owned by |version_|. So it is safe to pass the unretained |
|
falken
2016/11/23 14:32:31
nit: there is no longer a |dispatcher|
shimazu
2016/11/24 06:47:32
Done.
|
| // raw pointer of |version_| to OnFetchEventFinished callback. |
| // Pass |url_loader_factory_|, |url_Loader_| and |url_loader_client_| to the |
| // callback to keep them alive while the FetchEvent is onging in the service |
| // worker. |
| - dispatcher->DispatchFetchEvent( |
| + version_->event_dispatcher()->DispatchFetchEvent( |
| fetch_event_id, *request_, std::move(preload_handle_), |
| base::Bind(&OnFetchEventFinished, base::Unretained(version_.get()), |
| event_finish_id, base::Passed(std::move(url_loader_factory_)), |