Convert ActiveTabPermissionGranter to use the new navigation callbacks.

chrome/browser/extensions/active_tab_permission_granter.cc

 // Copyright (c) 2012 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/active_tab_permission_granter.h"
 
 #include "chrome/browser/extensions/extension_action_runner.h"
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.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/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/user_script.h"
@@ skipping 111 matching lines @@
       ExtensionActionRunner::GetForWebContents(web_contents())
           ->OnActiveTabPermissionGranted(extension);
     }
   }
 }
 
 void ActiveTabPermissionGranter::RevokeForTesting() {
   ClearActiveExtensionsAndNotify();
 }
 
-void ActiveTabPermissionGranter::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
-  if (details.is_in_page)
+void ActiveTabPermissionGranter::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() ||
+      !navigation_handle->HasCommitted() ||
+      navigation_handle->IsSamePage()) {
     return;
-  DCHECK(details.is_main_frame);  // important: sub-frames don't get granted!

[Devlin, 2017/02/07 02:42:47]

Nit: maybe preserve this comment?

[jam, 2017/02/07 04:17:03]

Done.

+  }
 
   // Only clear the granted permissions for cross-origin navigations.
   //
   // See http://crbug.com/404243 for why. Currently we only differentiate
   // between same-origin and cross-origin navigations when the
   // script-require-action flag is on. It's not clear it's good for general
   // activeTab consumption (we likely need to build some UI around it first).
   // However, the scripts-require-action feature is all-but unusable without
   // this behaviour.
   if (FeatureSwitch::scripts_require_action()->IsEnabled()) {
     const content::NavigationEntry* navigation_entry =
         web_contents()->GetController().GetVisibleEntry();
-    if (!navigation_entry || (navigation_entry->GetURL().GetOrigin() !=
-                              details.previous_url.GetOrigin())) {
+    if (!navigation_entry ||
+        (navigation_entry->GetURL().GetOrigin() !=
+            navigation_handle->GetPreviousURL().GetOrigin())) {
       ClearActiveExtensionsAndNotify();
     }
   } else {
     ClearActiveExtensionsAndNotify();
   }
 }
 
 void ActiveTabPermissionGranter::WebContentsDestroyed() {
   ClearActiveExtensionsAndNotify();
 }
@@ skipping 27 matching lines @@
   CreateMessageFunction clear_message =
       base::Bind(&CreateClearMessage, extension_ids, tab_id_);
   SendMessageToProcesses(frame_hosts,
                          web_contents()->GetRenderProcessHost(),
                          clear_message);
 
   granted_extensions_.Clear();
 }
 
 }  // namespace extensions