PlzNavigate: Make ServiceWorker work with PlzNavigate.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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/frame_host/navigation_handle_impl.h"
 
+#include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/common/service_worker/service_worker_types.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/content_switches.h"
 #include "net/url_request/redirect_info.h"
 
 namespace content {
 
 // static
 scoped_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
     const GURL& url,
     FrameTreeNode* frame_tree_node) {
   return scoped_ptr<NavigationHandleImpl>(
       new NavigationHandleImpl(url, frame_tree_node));
 }
 
 NavigationHandleImpl::NavigationHandleImpl(const GURL& url,
                                            FrameTreeNode* frame_tree_node)
     : url_(url),
       is_post_(false),
       has_user_gesture_(false),
       transition_(ui::PAGE_TRANSITION_LINK),
       is_external_protocol_(false),
       net_error_code_(net::OK),
       render_frame_host_(nullptr),
       is_same_page_(false),
       state_(INITIAL),
       is_transferring_(false),
-      frame_tree_node_(frame_tree_node) {
+      frame_tree_node_(frame_tree_node),
+      service_worker_provider_id_(kInvalidServiceWorkerProviderId) {
   GetDelegate()->DidStartNavigation(this);
 }
 
 NavigationHandleImpl::~NavigationHandleImpl() {
+  // PlzNavigate
+  // Post a task to the IO thread to clean up the ServiceWorkerProviderHost.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation) &&

[michaeln, 2015/10/07 01:16:44]

nit: would we ever expect a valid id value when the switch is not set? i think
we probably only need to test if != kinvalid here and if so DCHECK the flag is
set

[Fabrice (no longer in Chrome), 2015/10/07 12:59:43]

Sounds good.

+      service_worker_provider_id_ != kInvalidServiceWorkerProviderId) {
+    BrowserContext* browser_context =
+        frame_tree_node_->navigator()->GetController()->GetBrowserContext();
+    DCHECK(browser_context);
+
+    // TODO: Picking the partition based on the URL is incorrect.

[clamy, 2015/10/07 07:53:30]

nit: name in TODO. You can put mine if you want.

[Fabrice (no longer in Chrome), 2015/10/07 12:59:43]

Done.

+    // See crbug.com/513539
+    StoragePartition* partition =
+        BrowserContext::GetStoragePartitionForSite(browser_context, url_);
+    DCHECK(partition);
+    ServiceWorkerContextWrapper* service_worker_context =
+        static_cast<ServiceWorkerContextWrapper*>(
+            partition->GetServiceWorkerContext());
+
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&ServiceWorkerContextWrapper::RemoveNavigationProviderHost,
+                   service_worker_context, service_worker_provider_id_));
+  }
   GetDelegate()->DidFinishNavigation(this);
 }
 
 NavigatorDelegate* NavigationHandleImpl::GetDelegate() const {
   return frame_tree_node_->navigator()->GetDelegate();
 }
 
 const GURL& NavigationHandleImpl::GetURL() {
   return url_;
 }
@@ skipping 159 matching lines @@
 void NavigationHandleImpl::DidCommitNavigation(
     bool same_page,
     RenderFrameHostImpl* render_frame_host) {
   CHECK_IMPLIES(render_frame_host_, render_frame_host_ == render_frame_host);
   is_same_page_ = same_page;
   render_frame_host_ = render_frame_host;
   state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
 }
 
 }  // namespace content