Convert service_worker_client_utils to use the new navigation callbacks.

content/browser/service_worker/service_worker_client_utils.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/service_worker/service_worker_client_utils.h"
 
 #include <algorithm>
 #include <tuple>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/service_worker/service_worker_client_info.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/child_process_host.h"
 #include "url/gurl.h"
 
 namespace content {
 namespace service_worker_client_utils {
@@ skipping 12 matching lines @@
 // The callback will be called in the IO thread.
 class OpenURLObserver : public WebContentsObserver {
  public:
   OpenURLObserver(WebContents* web_contents,
                   int frame_tree_node_id,
                   const OpenURLCallback& callback)
       : WebContentsObserver(web_contents),
         frame_tree_node_id_(frame_tree_node_id),
         callback_(callback) {}
 
-  void DidCommitProvisionalLoadForFrame(
-      RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      ui::PageTransition transition_type) override {
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override {
     DCHECK(web_contents());
-
-    RenderFrameHostImpl* rfhi =
-        static_cast<RenderFrameHostImpl*>(render_frame_host);
-    if (rfhi->frame_tree_node()->frame_tree_node_id() != frame_tree_node_id_)
+    if (!navigation_handle->HasCommitted())
       return;
 
+    if (navigation_handle->GetFrameTreeNodeId() != frame_tree_node_id_)
+      return;
+
+    RenderFrameHost* render_frame_host =
+        navigation_handle->GetRenderFrameHost();
     RunCallback(render_frame_host->GetProcess()->GetID(),
                 render_frame_host->GetRoutingID());
   }
 
   void RenderProcessGone(base::TerminationStatus status) override {
     RunCallback(ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE);
   }
 
   void WebContentsDestroyed() override {
     RunCallback(ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE);
@@ skipping 425 matching lines @@
     GetWindowClients(controller, options, callback);
     return;
   }
 
   GetNonWindowClients(controller, options, &clients);
   DidGetClients(callback, &clients);
 }
 
 }  // namespace service_worker_client_utils
 }  // namespace content