Convert ExtensionViewGuest to use the new navigation callbacks.

extensions/browser/guest_view/extension_view/extension_view_guest.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 "extensions/browser/guest_view/extension_view/extension_view_guest.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/crx_file/id_util.h"
 #include "components/guest_view/browser/guest_view_event.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_process_host.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/guest_view/extension_view/extension_view_constants.h"
 #include "extensions/browser/guest_view/extension_view/whitelist/extension_view_whitelist.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "url/origin.h"
@@ skipping 88 matching lines @@
 }
 
 const char* ExtensionViewGuest::GetAPINamespace() const {
   return extensionview::kAPINamespace;
 }
 
 int ExtensionViewGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_EXTENSIONVIEW_TAG_PREFIX;
 }
 
-void ExtensionViewGuest::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
-  if (render_frame_host->GetParent())
+void ExtensionViewGuest::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->HasCommitted() || !navigation_handle->IsInMainFrame())
     return;
 
-  url_ = url;
+  url_ = navigation_handle->GetURL();
 
   std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetString(guest_view::kUrl, url_.spec());
   DispatchEventToView(base::MakeUnique<GuestViewEvent>(
       extensionview::kEventLoadCommit, std::move(args)));
 }
 
-void ExtensionViewGuest::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
-  if (attached() && !url::IsSameOriginWith(params.url, url_)) {

[Fady Samuel, 2017/01/26 23:39:07]

Do we want to allow navigating to a different origin now?

[jam, 2017/01/26 23:40:20]

well before there were two different navigation callbacks being listened to, and
this second one checked that the URL matched between them (since url_ is set in
the first one). now that we only have one navigation callback, it doesn't make
sense to check I thought.

-    bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
-                                    bad_message::EVG_BAD_ORIGIN);
-  }
-}
-
 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) {
   std::string src;
   params.GetString(extensionview::kAttributeSrc, &src);
   NavigateGuest(src, false /* force_navigation */);
 }
 
 }  // namespace extensions