diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 21:47:26 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 21:47:26 +0000 |
| commit | 076ebedaa781461c668ea435ef3af3ca707775d5 (patch) | |
| tree | 5189adac73248df281db674fff5ce4c08dda0ce8 /extensions/browser/info_map_unittest.cc | |
| parent | 4bd4064aede02bd5ae1c0a4b7a01af4830abb47a (diff) | |
| download | chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.zip chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.gz chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.bz2 | |
Remove deprecated permissions functions from Extension
The methods GetActivePermission() and HasAPIPermission() have been deprecated
for more than a year. Finally remove them.
Also clean up some includes in extension.h, and fix transitive includes.
BUG=379356
TBR=atwilson@chromium.org (c/b/background)
TBR=yurys@chromium.org (c/b/devtools)
TBR=bauerb@chromium.org (c/b/managed_mode)
TBR=dalecurtis@chromium.org (c/b/media)
TBR=dewittj@chromium.org (c/b/notifications)
TBR=msw@chromium.org (c/b/ui)
All TBRs are for strictly mechanical changes - no functional difference.
Review URL: https://codereview.chromium.org/314113010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/info_map_unittest.cc')
| -rw-r--r-- | extensions/browser/info_map_unittest.cc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/extensions/browser/info_map_unittest.cc b/extensions/browser/info_map_unittest.cc index d01fa61..c953468 100644 --- a/extensions/browser/info_map_unittest.cc +++ b/extensions/browser/info_map_unittest.cc @@ -10,6 +10,7 @@ #include "extensions/browser/info_map.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; @@ -144,16 +145,25 @@ TEST_F(InfoMapTest, CheckPermissions) { // chrome-extension URL or from its web extent. const Extension* match = info_map->extensions().GetExtensionOrAppByURL( app->GetResourceURL("a.html")); - EXPECT_TRUE(match && match->HasAPIPermission(APIPermission::kNotification)); + EXPECT_TRUE(match && + match->permissions_data()->HasAPIPermission( + APIPermission::kNotification)); match = info_map->extensions().GetExtensionOrAppByURL(app_url); - EXPECT_TRUE(match && match->HasAPIPermission(APIPermission::kNotification)); - EXPECT_FALSE(match && match->HasAPIPermission(APIPermission::kTab)); + EXPECT_TRUE(match && + match->permissions_data()->HasAPIPermission( + APIPermission::kNotification)); + EXPECT_FALSE( + match && + match->permissions_data()->HasAPIPermission(APIPermission::kTab)); // The extension should have the tabs permission. match = info_map->extensions().GetExtensionOrAppByURL( extension->GetResourceURL("a.html")); - EXPECT_TRUE(match && match->HasAPIPermission(APIPermission::kTab)); - EXPECT_FALSE(match && match->HasAPIPermission(APIPermission::kNotification)); + EXPECT_TRUE(match && + match->permissions_data()->HasAPIPermission(APIPermission::kTab)); + EXPECT_FALSE(match && + match->permissions_data()->HasAPIPermission( + APIPermission::kNotification)); // Random URL should not have any permissions. GURL evil_url("http://evil.com/a.html"); |