PS - Showing permission prompt for activeTab

chrome/browser/extensions/active_tab_permission_granter.cc

Index: chrome/browser/extensions/active_tab_permission_granter.cc
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc
index 1732c6070d7d14ba03f78769f85c6b040245a123..1eb056e32091dfbce02c71cc4a80df11a7d7bff2 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.cc
+++ b/chrome/browser/extensions/active_tab_permission_granter.cc
@@ -66,6 +66,8 @@ void SendMessageToProcesses(
     tab_process->Send(create_message.Run(false));
 }
 
+ActiveTabPermissionGranter::Delegate* g_delegate = nullptr;
+
 }  // namespace
 
 ActiveTabPermissionGranter::ActiveTabPermissionGranter(
@@ -80,6 +82,20 @@ ActiveTabPermissionGranter::ActiveTabPermissionGranter(
 
 ActiveTabPermissionGranter::~ActiveTabPermissionGranter() {}
 
+// static
+void ActiveTabPermissionGranter::SetPlatformDelegate(Delegate* delegate) {
+  // Disallow setting it twice (but allow resetting - don't forget to free in
+  // that case).
+  CHECK(!g_delegate || !delegate);
+  g_delegate = delegate;
+}
+
+// static
+void ActiveTabPermissionGranter::FreePlatformDelegateForTesting() {
+  free(g_delegate);

[Devlin, 2017/05/23 19:28:03]

Why do we need this?  Just for ASAN?

[Ivan Šandrk, 2017/05/24 09:29:01]

Yes

+  g_delegate = nullptr;
+}
+
 void ActiveTabPermissionGranter::GrantIfRequested(const Extension* extension) {
   if (granted_extensions_.Contains(extension->id()))
     return;
@@ -89,11 +105,14 @@ void ActiveTabPermissionGranter::GrantIfRequested(const Extension* extension) {
 
   const PermissionsData* permissions_data = extension->permissions_data();
 
+  bool should_grant_active_tab = !g_delegate ||
+      g_delegate->ShouldGrantActiveTab(extension, web_contents());

[Devlin, 2017/05/23 19:28:04]

Is this git cl format'd?

[Ivan Šandrk, 2017/05/24 09:29:01]

Nope, now it is :)

   // If the extension requested all-hosts but has had it withheld, we grant it
   // active tab-style permissions, even if it doesn't have the activeTab
   // permission in the manifest.
-  if (permissions_data->HasAPIPermission(APIPermission::kActiveTab) ||
-      permissions_data->HasWithheldImpliedAllHosts()) {
+  if (should_grant_active_tab &&
+      (permissions_data->HasWithheldImpliedAllHosts() ||
+       permissions_data->HasAPIPermission(APIPermission::kActiveTab))) {
     new_hosts.AddOrigin(UserScript::ValidUserScriptSchemes(),
                         web_contents()->GetVisibleURL().GetOrigin());
     new_apis.insert(APIPermission::kTab);