Make extension commands grant the activeTab permission.

chrome/browser/extensions/active_tab_unittest.cc

Index: chrome/browser/extensions/active_tab_unittest.cc
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index cbbc43873857f76a10eff440725ac08a66d21163..550327a106033689ea9180a054e78649e0bebfe8 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/active_tab_permission_manager.h"
+#include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -66,9 +66,9 @@ class ActiveTabTest : public TabContentsTestHarness {
     return SessionID::IdForTab(tab_contents()->web_contents());
   }
 
-  ActiveTabPermissionManager* active_tab_permission_manager() {
+  ActiveTabPermissionGranter* active_tab_permission_granter() {
     return extensions::TabHelper::FromWebContents(web_contents())->
-        active_tab_permission_manager();
+        active_tab_permission_granter();
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
@@ -137,8 +137,8 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   EXPECT_FALSE(HasTabsPermission(another_extension));
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab);
 
   // Granted to extension and extension_without_active_tab, but the latter
@@ -165,22 +165,22 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
   // But they should still be able to be granted again.
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
   // And grant a few more times redundantly for good measure.
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsAllowed(another_extension, google));
@@ -204,9 +204,9 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
 
   // Should be able to grant to multiple extensions at the same time (if they
   // have the activeTab permission, of course).
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab);
 
   EXPECT_TRUE(IsBlocked(extension, google));
@@ -220,9 +220,9 @@ TEST_F(ActiveTabTest, GrantToSinglePage) {
   // Should be able to go back to URLs that were previously cleared.
   NavigateAndCommit(google);
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
-  active_tab_permission_manager()->GrantIfRequested(another_extension);
-  active_tab_permission_manager()->GrantIfRequested(
+  active_tab_permission_granter()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(another_extension);
+  active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab);
 
   EXPECT_TRUE(IsAllowed(extension, google));
@@ -239,9 +239,9 @@ TEST_F(ActiveTabTest, Uninstalling) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
-  EXPECT_TRUE(active_tab_permission_manager()->IsGranted(extension));
+  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension));
   EXPECT_TRUE(IsAllowed(extension, google));
 
   // Uninstalling the extension should clear its tab permissions.
@@ -253,15 +253,15 @@ TEST_F(ActiveTabTest, Uninstalling) {
       content::Source<Profile>(tab_contents()->profile()),
       content::Details<UnloadedExtensionInfo>(&details));
 
-  EXPECT_FALSE(active_tab_permission_manager()->IsGranted(extension));
+  EXPECT_FALSE(active_tab_permission_granter()->IsGranted(extension));
   // Note: can't EXPECT_FALSE(IsAllowed) here because uninstalled extensions
   // are just that... considered to be uninstalled, and the manager might
   // just ignore them from here on.
 
   // Granting the extension again should give them back.
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
-  EXPECT_TRUE(active_tab_permission_manager()->IsGranted(extension));
+  EXPECT_TRUE(active_tab_permission_granter()->IsGranted(extension));
   EXPECT_TRUE(IsAllowed(extension, google));
 }
 
@@ -269,7 +269,7 @@ TEST_F(ActiveTabTest, OnlyActiveTab) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
   EXPECT_TRUE(IsAllowed(extension, google, tab_id()));
   EXPECT_TRUE(IsBlocked(extension, google, tab_id() + 1));
@@ -280,7 +280,7 @@ TEST_F(ActiveTabTest, NavigateInPage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
   // Perform an in-page navigation. The extension should not lose the temporary
   // permission.
@@ -297,7 +297,7 @@ TEST_F(ActiveTabTest, NavigateInPage) {
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
 
-  active_tab_permission_manager()->GrantIfRequested(extension);
+  active_tab_permission_granter()->GrantIfRequested(extension);
 
   EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));