Convert ExtensionWebContentsObserver 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"
@@ skipping 119 matching lines @@
 
 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 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 {
+    if (frame_extension && !navigation_handle->IsSamePage()) {
+      // 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 if (!frame_extension) {
+      pm->UnregisterRenderFrameHost(render_frame_host);
+    }
+  } else if (frame_extension) {
     pm->RegisterRenderFrameHost(web_contents(), render_frame_host,
                                 frame_extension);
   }
 }
 
 bool ExtensionWebContentsObserver::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(
@@ skipping 104 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