Convert ChromeExtensionWebContentsObserver to use the new navigation callbacks.

extensions/browser/extension_web_contents_observer.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/extension_web_contents_observer.h"
 
 #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"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_api_frame_id_map.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ skipping 109 matching lines @@
   ExtensionApiFrameIdMap::Get()->CacheFrameData(render_frame_host);
 }
 
 void ExtensionWebContentsObserver::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   ProcessManager::Get(browser_context_)
       ->UnregisterRenderFrameHost(render_frame_host);
   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);
 
     if (!frame_extension)
       pm->UnregisterRenderFrameHost(render_frame_host);
   }
 }
 
 void ExtensionWebContentsObserver::DidNavigateAnyFrame(
     content::RenderFrameHost* render_frame_host,
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   const Extension* frame_extension =
       GetExtensionFromFrame(render_frame_host, true);
   ProcessManager* pm = ProcessManager::Get(browser_context_);
 
   if (!frame_extension) {
-    // Should have been unregistered by DidCommitProvisionalLoadForFrame.
+    // Should have been unregistered by DidFinishNavigation.
     DCHECK(!pm->IsRenderFrameHostRegistered(render_frame_host));
     return;
   }
 
   if (pm->IsRenderFrameHostRegistered(render_frame_host)) {
     // Notify ProcessManager, because some clients do not just want to know
     // whether the frame is in an extension process, but also whether the frame
     // was navigated.
     pm->DidNavigateRenderFrameHost(render_frame_host);
   } else {
@@ skipping 114 matching lines @@
   // Since this is called for all existing RenderFrameHosts during the
   // ExtensionWebContentsObserver's creation, it's possible that not all hosts
   // are ready.
   // We only initialize the frame if the renderer counterpart is live; otherwise
   // we wait for the RenderFrameCreated notification.
   if (render_frame_host->IsRenderFrameLive())
     InitializeRenderFrame(render_frame_host);
 }
 
 }  // namespace extensions