Convert ChromeExtensionWebContentsObserver to use the new navigation callbacks.

extensions/browser/extension_web_contents_observer.cc

Index: extensions/browser/extension_web_contents_observer.cc
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc
index 42823d1749d98e04fb227bf4c63529ac8179f92f..86c813c949dbf695287c2c27055ad3c4b91082fb 100644
--- a/extensions/browser/extension_web_contents_observer.cc
+++ b/extensions/browser/extension_web_contents_observer.cc
@@ -6,6 +6,7 @@
 
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -135,12 +136,15 @@ void ExtensionWebContentsObserver::RenderFrameDeleted(
   ExtensionApiFrameIdMap::Get()->RemoveFrameData(render_frame_host);
 }
 
-void ExtensionWebContentsObserver::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
+void ExtensionWebContentsObserver::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->HasCommitted())
+    return;
+
   ProcessManager* pm = ProcessManager::Get(browser_context_);
 
+  content::RenderFrameHost* render_frame_host =
+      navigation_handle->GetRenderFrameHost();
   if (pm->IsRenderFrameHostRegistered(render_frame_host)) {
     const Extension* frame_extension =
         GetExtensionFromFrame(render_frame_host, true);
@@ -162,7 +166,7 @@ void ExtensionWebContentsObserver::DidNavigateAnyFrame(
   ProcessManager* pm = ProcessManager::Get(browser_context_);
 
   if (!frame_extension) {
-    // Should have been unregistered by DidCommitProvisionalLoadForFrame.
+    // Should have been unregistered by DidCommitNavigation.

[Devlin, 2017/01/27 18:15:26]

s/DidCommitNavigation/DidFinishNavigation

[jam, 2017/01/27 19:06:35]

Done.

     DCHECK(!pm->IsRenderFrameHostRegistered(render_frame_host));
     return;
   }