Introduce a new ResourceRequesterInfo type for NavigationPreload.

content/browser/service_worker/service_worker_fetch_dispatcher.cc

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 44ee6c60148e7270bde3df5c5d16d22b2f14f722..729658e27e160598d10c1d1110ea7de467280c1f 100644
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
@@ -380,20 +380,19 @@ void ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
 
   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())
+  ResourceRequesterInfo* requester_info = original_info->requester_info();
+  DCHECK((IsBrowserSideNavigationEnabled() &&

[yhirano, 2016/12/01 09:40:02]

I would prefer an explicit if-statement.

If (IsBrowserSideNavigationEnabled()) {
  DCHECK(requester_info->IsBrowserSideNavigation());
} else {
  DCHECK(requester_info->IsRenderer());
  if (!requester_info->filter())
    return;
}

[horo, 2016/12/01 10:37:35]

Done.

+          requester_info->IsBrowserSideNavigation()) ||
+         (!IsBrowserSideNavigationEnabled() && requester_info->IsRenderer()));
+
+  if (requester_info->IsRenderer() && !requester_info->filter())
     return;
 
   DCHECK(!url_loader_factory_);
   mojom::URLLoaderFactoryPtr factory;
-  URLLoaderFactoryImpl::Create(original_info->requester_info(),
-                               mojo::GetProxy(&url_loader_factory_));
+  URLLoaderFactoryImpl::Create(
+      ResourceRequesterInfo::CreateForNavigationPreload(requester_info),
+      mojo::GetProxy(&url_loader_factory_));
 
   preload_handle_ = mojom::FetchEventPreloadHandle::New();