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

1 files changed, 4 insertions, 2 deletions

diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc
index 42b85c5..1042f63 100644
--- a/extensions/browser/info_map.cc
+++ b/extensions/browser/info_map.cc
@@ -10,6 +10,7 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
+#include "extensions/common/permissions/permissions_data.h"
 
 using content::BrowserThread;
 
@@ -150,7 +151,8 @@ void InfoMap::GetExtensionsWithAPIPermissionForSecurityOrigin(
   if (origin.SchemeIs(kExtensionScheme)) {
     const std::string& id = origin.host();
     const Extension* extension = extensions_.GetByID(id);
-    if (extension && extension->HasAPIPermission(permission) &&
+    if (extension &&
+        extension->permissions_data()->HasAPIPermission(permission) &&
         process_map_.Contains(id, process_id)) {
       extensions->Insert(extension);
     }
@@ -161,7 +163,7 @@ void InfoMap::GetExtensionsWithAPIPermissionForSecurityOrigin(
   for (; i != extensions_.end(); ++i) {
     if ((*i)->web_extent().MatchesSecurityOrigin(origin) &&
         process_map_.Contains((*i)->id(), process_id) &&
-        (*i)->HasAPIPermission(permission)) {
+        (*i)->permissions_data()->HasAPIPermission(permission)) {
       extensions->Insert(*i);
     }
   }