Convert WebContentsModalDialogManager to use the new navigation callbacks.

components/web_modal/web_contents_modal_dialog_manager.cc

 // Copyright (c) 2012 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/web_modal/web_contents_modal_dialog_manager.h"
 
 #include <utility>
 
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(web_modal::WebContentsModalDialogManager);
 
 namespace web_modal {
@@ skipping 108 matching lines @@
   closing_all_dialogs_ = true;
 
   // Clear out any dialogs since we are leaving this page entirely.
   while (!child_dialogs_.empty()) {
     child_dialogs_.front()->manager->Close();
   }
 
   closing_all_dialogs_ = false;
 }
 
-void WebContentsModalDialogManager::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
+void WebContentsModalDialogManager::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
+    return;
+
   // Close constrained windows if necessary.
   if (!net::registry_controlled_domains::SameDomainOrHost(
-          details.previous_url, details.entry->GetURL(),
+          navigation_handle->GetPreviousURL(), navigation_handle->GetURL(),
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES))
     CloseAllDialogs();
 }
 
 void WebContentsModalDialogManager::DidGetIgnoredUIEvent() {
   if (!child_dialogs_.empty()) {
     child_dialogs_.front()->manager->Focus();
   }
 }
 
@@ skipping 13 matching lines @@
   // some of these to close.  CloseAllDialogs is async, so it might get called
   // twice before it runs.
   CloseAllDialogs();
 }
 
 void WebContentsModalDialogManager::DidAttachInterstitialPage() {
   CloseAllDialogs();
 }
 
 }  // namespace web_modal