Convert DistillabilityDriver to use the new navigation callbacks.

components/dom_distiller/content/browser/distillability_driver.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 "components/dom_distiller/content/browser/distillability_driver.h"
 
 #include "base/memory/ptr_util.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
     dom_distiller::DistillabilityDriver);
 
@@ skipping 63 matching lines @@
   // This method is invoked if any of the active RenderFrameHosts are swapped.
   // Only add the mojo service to the main frame host.
   if (!web_contents() || web_contents()->GetMainFrame() != new_host) return;
 
   // If the RenderFrameHost changes (this will happen if the user navigates to
   // or from a native page), the service needs to be attached to that host.
   mojo_needs_setup_ = true;
   SetupMojoService(new_host);
 }
 
-void DistillabilityDriver::DidStartProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host, const GURL& validated_url,
-    bool is_error_page) {
-  SetupMojoService(render_frame_host);
+void DistillabilityDriver::ReadyToCommitNavigation(
+      content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsSamePage())
+    SetupMojoService(navigation_handle->GetRenderFrameHost());
 }
 
 void DistillabilityDriver::SetupMojoService(
     content::RenderFrameHost* frame_host) {
   if (!frame_host || !frame_host->GetInterfaceRegistry()
       || !mojo_needs_setup_) {
     return;
   }
 
   frame_host->GetInterfaceRegistry()->AddInterface(
       base::Bind(&DistillabilityDriver::CreateDistillabilityService,
           weak_factory_.GetWeakPtr()));
   mojo_needs_setup_ = false;
 }
 
 }  // namespace dom_distiller