Convert ExtensionOptionsGuest to use the new navigation callbacks.

extensions/browser/guest_view/extension_options/extension_options_guest.cc

 // Copyright 2014 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 "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "components/guest_view/browser/guest_view_event.h"
 #include "components/guest_view/browser/guest_view_manager.h"
-#include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/bad_message.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/extension_options/extension_options_constants.h"
 #include "extensions/browser/guest_view/extension_options/extension_options_guest_delegate.h"
@@ skipping 188 matching lines @@
   //   ctrl-click or middle mouse button click
   if (extension_options_guest_delegate_) {
     extension_options_guest_delegate_->OpenURLInNewTab(
         content::OpenURLParams(target_url, content::Referrer(),
                                WindowOpenDisposition::NEW_FOREGROUND_TAB,
                                ui::PAGE_TRANSITION_LINK, false));
   }
   return false;
 }
 
-void ExtensionOptionsGuest::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
-  if (attached()) {
-    auto* guest_zoom_controller =
-        zoom::ZoomController::FromWebContents(web_contents());
-    guest_zoom_controller->SetZoomMode(
-        zoom::ZoomController::ZOOM_MODE_ISOLATED);
-    SetGuestZoomLevelToMatchEmbedder();
+void ExtensionOptionsGuest::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() ||
+      !navigation_handle->HasCommitted() || !attached()) {
+    return;
+  }
 
-    if (!url::IsSameOriginWith(params.url, options_page_)) {
-      bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
-                                      bad_message::EOG_BAD_ORIGIN);
-    }
+  auto* guest_zoom_controller =
+      zoom::ZoomController::FromWebContents(web_contents());
+  guest_zoom_controller->SetZoomMode(zoom::ZoomController::ZOOM_MODE_ISOLATED);
+  SetGuestZoomLevelToMatchEmbedder();
+
+  if (!url::IsSameOriginWith(navigation_handle->GetURL(), options_page_)) {
+    bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
+                                    bad_message::EOG_BAD_ORIGIN);
   }
 }
 
 }  // namespace extensions