Make ActiveTabPermissionManager also grant the tabs permission.

chrome/browser/extensions/active_tab_unittest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 66 matching lines @@
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url) {
     return IsAllowed(extension, url, tab_id());
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  int tab_id) {
-    return (extension->CanExecuteScriptOnPage(url, tab_id, NULL, NULL) &&
-            extension->CanCaptureVisiblePage(url, tab_id, NULL));
+    return extension->CanExecuteScriptOnPage(url, tab_id, NULL, NULL) &&
+           extension->CanCaptureVisiblePage(url, tab_id, NULL) &&
+           HasTabsPermission(extension, tab_id);
   }
 
   bool IsBlocked(const scoped_refptr<const Extension>& extension,
                  const GURL& url) {
     return IsBlocked(extension, url, tab_id());
   }
 
   bool IsBlocked(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  int tab_id) {
-    return (!extension->CanExecuteScriptOnPage(url, tab_id, NULL, NULL) &&
-            !extension->CanCaptureVisiblePage(url, tab_id, NULL));
+    // Note: can't check HasTabsPermission because it isn't URL specific.
+    return !extension->CanExecuteScriptOnPage(url, tab_id, NULL, NULL) &&
+           !extension->CanCaptureVisiblePage(url, tab_id, NULL);
+  }
+
+  bool HasTabsPermission(const scoped_refptr<const Extension>& extension) {
+    return HasTabsPermission(extension, tab_id());
+  }
+
+  bool HasTabsPermission(const scoped_refptr<const Extension>& extension,
+                         int tab_id) {
+    return extension->HasAPIPermissionForTab(tab_id, APIPermission::kTab);
   }
 
   // An extension with the activeTab permission.
   scoped_refptr<const Extension> extension;
 
   // Another extension with activeTab (for good measure).
   scoped_refptr<const Extension> another_extension;
 
   // An extension without the activeTab permission.
   scoped_refptr<const Extension> extension_without_active_tab;
 
  private:
   content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(ActiveTabTest, GrantToSinglePage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   // No access unless it's been granted.
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
+  EXPECT_FALSE(HasTabsPermission(extension));
+  EXPECT_FALSE(HasTabsPermission(another_extension));
+  EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
+
   active_tab_permission_manager()->GrantIfRequested(extension);
   active_tab_permission_manager()->GrantIfRequested(
       extension_without_active_tab);
 
   // Granted to extension and extension_without_active_tab, but the latter
   // doesn't have the activeTab permission so not granted.
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
   // Other subdomains shouldn't be given access.
   GURL mail_google("http://mail.google.com");
   EXPECT_TRUE(IsBlocked(extension, mail_google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsBlocked(another_extension, mail_google));
+  EXPECT_TRUE(IsBlocked(extension_without_active_tab, mail_google));
 
   // Reloading the page should clear the active permissions.
   Reload();
 
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
+  EXPECT_FALSE(HasTabsPermission(extension));
+  EXPECT_FALSE(HasTabsPermission(another_extension));
+  EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
+
   // But they should still be able to be granted again.
   active_tab_permission_manager()->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);
@@ skipping 14 matching lines @@
   NavigateAndCommit(chromium);
 
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
   EXPECT_TRUE(IsBlocked(extension, chromium));
   EXPECT_TRUE(IsBlocked(another_extension, chromium));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, chromium));
 
+  EXPECT_FALSE(HasTabsPermission(extension));
+  EXPECT_FALSE(HasTabsPermission(another_extension));
+  EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
+
   // 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(
       extension_without_active_tab);
 
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
@@ skipping 51 matching lines @@
 }
 
 TEST_F(ActiveTabTest, OnlyActiveTab) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_manager()->GrantIfRequested(extension);
 
   EXPECT_TRUE(IsAllowed(extension, google, tab_id()));
   EXPECT_TRUE(IsBlocked(extension, google, tab_id() + 1));
+  EXPECT_FALSE(HasTabsPermission(extension, tab_id() + 1));
 }
 
 TEST_F(ActiveTabTest, NavigateInPage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_manager()->GrantIfRequested(extension);
 
   // Perform an in-page navigation. The extension should not lose the temporary
   // permission.
@@ skipping 27 matching lines @@
   Reload();
 
   EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium_h1, tab_id()));
 }
 
 }  // namespace
 }  // namespace extensions