PlzNavigate: detect when a ServiceWorker is present

content/browser/loader/navigation_url_loader_impl.cc

Index: content/browser/loader/navigation_url_loader_impl.cc
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
index bd0199c99e2efc3cca6547532c8ca6616a852d8f..656fa90eb791327ee463eb165d1abbe98756cb21 100644
--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -12,7 +12,6 @@
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/browser/loader/navigation_url_loader_impl_core.h"
-#include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_data.h"
@@ -23,7 +22,7 @@ namespace content {
 NavigationURLLoaderImpl::NavigationURLLoaderImpl(
     BrowserContext* browser_context,
     std::unique_ptr<NavigationRequestInfo> request_info,
-    ServiceWorkerNavigationHandle* service_worker_handle,
+    ServiceWorkerContextWrapper* service_worker_context_wrapper,
     NavigationURLLoaderDelegate* delegate)
     : delegate_(delegate), weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -38,13 +37,11 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
       "navigation", "Navigation timeToResponseStarted", core_,
       request_info->common_params.navigation_start.ToInternalValue(),
       "FrameTreeNode id", request_info->frame_tree_node_id);
-  ServiceWorkerNavigationHandleCore* service_worker_handle_core =
-      service_worker_handle ? service_worker_handle->core() : nullptr;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NavigationURLLoaderImplCore::Start, base::Unretained(core_),
                  browser_context->GetResourceContext(),
-                 service_worker_handle_core, base::Passed(&request_info)));
+                 service_worker_context_wrapper, base::Passed(&request_info)));
 }
 
 NavigationURLLoaderImpl::~NavigationURLLoaderImpl() {
@@ -103,4 +100,10 @@ void NavigationURLLoaderImpl::NotifyRequestStarted(base::TimeTicks timestamp) {
   delegate_->OnRequestStarted(timestamp);
 }
 
+void NavigationURLLoaderImpl::NotifyServiceWorkerEncountered() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  delegate_->OnServiceWorkerEncountered();
+}
+
 }  // namespace content