Run any pending injections in ActiveScriptController if permission is granted

chrome/browser/extensions/active_script_controller_unittest.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 <map>
 
 #include "base/values.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 258 matching lines @@
   ActiveTabPermissionGranter* active_tab_permission_granter =
       TabHelper::FromWebContents(web_contents())
           ->active_tab_permission_granter();
   ASSERT_TRUE(active_tab_permission_granter);
   // Grant the extension active tab permissions. This normally happens, e.g.,
   // if the user clicks on a browser action.
   active_tab_permission_granter->GrantIfRequested(extension);
 
   // Since we have active tab permissions, we shouldn't need user consent
   // anymore.
-  EXPECT_FALSE(
-      controller()->RequiresUserConsentForScriptInjection(extension));
+  EXPECT_FALSE(controller()->RequiresUserConsentForScriptInjection(extension));
 
-  // TODO(rdevlin.cronin): We should also implement/test that granting active
-  // tab permissions automatically runs any pending injections.
+  // Also test that granting active tab runs any pending tasks.
+  NavigateAndCommit(GURL("https://www.google.com"));
+  // Navigating should mean we need permission again.
+  EXPECT_TRUE(controller()->RequiresUserConsentForScriptInjection(extension));
+
+  controller()->RequestScriptInjection(
+      extension,
+      GetPageId(),
+      GetExecutionCallbackForExtension(extension->id()));
+  EXPECT_TRUE(controller()->GetActionForExtension(extension));
+  EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
+
+  // Grant active tab.
+  active_tab_permission_granter->GrantIfRequested(extension);
+
+  // The pending injections should have run since active tab permission was
+  // granted.
+  EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
+  EXPECT_FALSE(controller()->GetActionForExtension(extension));
 }
 
 }  // namespace extensions