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 64aaa7c8cef5a6a879251a07a93c748ab0a5f163..052d7952e65994afd76a309a3cef4c5365d199a3 100644 |
| --- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc |
| @@ -15,6 +15,7 @@ |
| #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| #include "content/browser/loader/resource_message_filter.h" |
|
yhirano
2016/11/10 06:42:30
Not needed.
horo
2016/11/10 14:46:33
Done.
|
| #include "content/browser/loader/resource_request_info_impl.h" |
| +#include "content/browser/loader/resource_requester_info.h" |
| #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" |
| @@ -366,19 +367,22 @@ void ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload( |
| // Origin-Trial for NavigationPreload. |
| return; |
| } |
| + |
| + const ResourceRequestInfoImpl* original_info = |
| + ResourceRequestInfoImpl::ForRequest(original_request); |
| if (IsBrowserSideNavigationEnabled()) { |
| // TODO(horo): Support NavigationPreload with PlzNavigate. |
| + DCHECK(original_info->requester_info().IsBrowserSideNavigation()); |
| NOTIMPLEMENTED(); |
| return; |
| } |
| + DCHECK(original_info->requester_info().IsRenderer()); |
| + if (!original_info->requester_info().filter()) |
| + return; |
| DCHECK(!url_loader_factory_); |
| - const ResourceRequestInfoImpl* original_info = |
| - ResourceRequestInfoImpl::ForRequest(original_request); |
| - if (!original_info->filter()) |
| - return; |
| mojom::URLLoaderFactoryPtr factory; |
| - URLLoaderFactoryImpl::Create(original_info->filter(), |
| + URLLoaderFactoryImpl::Create(original_info->requester_info().clone(), |
| mojo::GetProxy(&url_loader_factory_)); |
| preload_handle_ = mojom::FetchEventPreloadHandle::New(); |