Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: chrome/browser/extensions/active_tab_unittest.cc

Issue 315573003: Remove PermissionsData::ForExtension() completely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 93be34e953f8cbf3a49e1cd271f02cdb1581f734..6f7823aab6cc2437754d95009d63a109b1900bdd 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -107,8 +107,7 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness {
const GURL& url,
PermittedFeature feature,
int tab_id) {
- const PermissionsData* permissions_data =
- PermissionsData::ForExtension(extension);
+ const PermissionsData* permissions_data = extension->permissions_data();
bool script = permissions_data->CanExecuteScriptOnPage(
extension, url, url, tab_id, NULL, -1, NULL);
bool capture = HasTabsPermission(extension, tab_id) &&
@@ -144,13 +143,13 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness {
bool HasTabsPermission(const scoped_refptr<const Extension>& extension,
int tab_id) {
- return PermissionsData::ForExtension(extension)
- ->HasAPIPermissionForTab(tab_id, APIPermission::kTab);
+ return extension->permissions_data()->HasAPIPermissionForTab(
+ tab_id, APIPermission::kTab);
}
bool IsGrantedForTab(const Extension* extension,
const content::WebContents* web_contents) {
- return PermissionsData::ForExtension(extension)->HasAPIPermissionForTab(
+ return extension->permissions_data()->HasAPIPermissionForTab(
SessionID::IdForTab(web_contents), APIPermission::kTab);
}
@@ -370,7 +369,7 @@ TEST_F(ActiveTabTest, ChromeUrlGrants) {
EXPECT_TRUE(IsAllowed(extension_with_tab_capture, internal,
PERMITTED_CAPTURE_ONLY));
const PermissionsData* permissions_data =
- PermissionsData::ForExtension(extension_with_tab_capture);
+ extension_with_tab_capture->permissions_data();
EXPECT_TRUE(permissions_data->HasAPIPermissionForTab(
tab_id(), APIPermission::kTabCaptureForTab));

Powered by Google App Engine
This is Rietveld 408576698