Introduce a new ResourceRequesterInfo type for NavigationPreload.

content/browser/service_worker/service_worker_fetch_dispatcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 362 matching lines @@
     return;
   if (!base::FeatureList::IsEnabled(
           features::kServiceWorkerNavigationPreload)) {
     // TODO(horo): Check |version_|'s origin_trial_tokens() here if we use
     // Origin-Trial for NavigationPreload.
     return;
   }
 
   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();
 
   ResourceRequest request;
   request.method = original_request->method();
   request.url = original_request->url();
   request.request_initiator = original_request->initiator();
   request.referrer = GURL(original_request->referrer());
   request.referrer_policy = original_info->GetReferrerPolicy();
   request.visibility_state = original_info->GetVisibilityState();
@@ skipping 41 matching lines @@
 }
 
 ServiceWorkerMetrics::EventType ServiceWorkerFetchDispatcher::GetEventType()
     const {
   if (request_->fetch_type == ServiceWorkerFetchType::FOREIGN_FETCH)
     return ServiceWorkerMetrics::EventType::FOREIGN_FETCH;
   return ResourceTypeToEventType(resource_type_);
 }
 
 }  // namespace content