Convert ChromeExtensionWebContentsObserver to use the new navigation callbacks.

chrome/browser/extensions/chrome_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 "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "chrome/common/url_constants.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/child_process_security_policy.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/common/content_switches.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/switches.h"
@@ skipping 41 matching lines @@
       extension->is_legacy_packaged_app() ||
       (extension->is_platform_app() &&
        Manifest::IsComponentLocation(extension->location()))) {
     policy->GrantOrigin(process_id,
                         url::Origin(GURL(chrome::kChromeUIFaviconURL)));
     policy->GrantOrigin(process_id,
                         url::Origin(GURL(chrome::kChromeUIExtensionIconURL)));
   }
 }
 
-void ChromeExtensionWebContentsObserver::DidCommitProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
-  ExtensionWebContentsObserver::DidCommitProvisionalLoadForFrame(
-      render_frame_host, url, transition_type);
-  SetExtensionIsolationTrial(render_frame_host);
+void ChromeExtensionWebContentsObserver::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  ExtensionWebContentsObserver::DidFinishNavigation(navigation_handle);
+  if (navigation_handle->HasCommitted())
+    SetExtensionIsolationTrial(navigation_handle->GetRenderFrameHost());
 }
 
 bool ChromeExtensionWebContentsObserver::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   if (ExtensionWebContentsObserver::OnMessageReceived(message,
                                                       render_frame_host)) {
     return true;
   }
 
@@ skipping 125 matching lines @@
             g_browser_process->rappor_service()) {
       const std::string& extension_id =
           parent_is_extension ? parent_url.host() : frame_url.host();
       rappor->RecordSampleString("Extensions.AffectedByIsolateExtensions",
                                  rappor::UMA_RAPPOR_TYPE, extension_id);
     }
   }
 }
 
 }  // namespace extensions