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

6 files changed, 28 insertions, 11 deletions

diff --git a/extensions/browser/api/storage/local_value_store_cache.cc b/extensions/browser/api/storage/local_value_store_cache.cc
index 6946f33..4865b31 100644
--- a/extensions/browser/api/storage/local_value_store_cache.cc
+++ b/extensions/browser/api/storage/local_value_store_cache.cc
@@ -18,6 +18,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/api_permission.h"
+#include "extensions/common/permissions/permissions_data.h"
 
 using content::BrowserThread;
 
@@ -62,7 +63,8 @@ void LocalValueStoreCache::RunWithValueStoreForExtension(
 
   // A neat way to implement unlimited storage; if the extension has the
   // unlimited storage permission, force through all calls to Set().
-  if (extension->HasAPIPermission(APIPermission::kUnlimitedStorage)) {
+  if (extension->permissions_data()->HasAPIPermission(
+          APIPermission::kUnlimitedStorage)) {
     WeakUnlimitedSettingsStorage unlimited_storage(storage);
     callback.Run(&unlimited_storage);
   } else {
diff --git a/extensions/browser/api/storage/settings_test_util.cc b/extensions/browser/api/storage/settings_test_util.cc
index a44a5a0d..c1ac660 100644
--- a/extensions/browser/api/storage/settings_test_util.cc
+++ b/extensions/browser/api/storage/settings_test_util.cc
@@ -93,7 +93,7 @@ scoped_refptr<const Extension> AddExtensionWithIdAndPermissions(
 
   for (std::set<std::string>::const_iterator it = permissions_set.begin();
       it != permissions_set.end(); ++it) {
-    DCHECK(extension->HasAPIPermission(*it));
+    DCHECK(extension->permissions_data()->HasAPIPermission(*it));
   }
 
   return extension;
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index c441195..3c6679f 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -30,6 +30,7 @@
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
+#include "extensions/common/permissions/permissions_data.h"
 
 using base::DictionaryValue;
 using base::ListValue;
@@ -533,8 +534,9 @@ void EventRouter::DispatchEventToProcess(const std::string& extension_id,
   // permission for it (or if the event originated from itself).
   if (!event->event_url.is_empty() &&
       event->event_url.host() != extension->id() &&
-      !extension->GetActivePermissions()->HasEffectiveAccessToURL(
-          event->event_url)) {
+      !extension->permissions_data()
+           ->active_permissions()
+           ->HasEffectiveAccessToURL(event->event_url)) {
     return;
   }
 
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);
     }
   }
diff --git a/extensions/browser/info_map.h b/extensions/browser/info_map.h
index 5dfc9c2..5b1f8a3 100644
--- a/extensions/browser/info_map.h
+++ b/extensions/browser/info_map.h
@@ -14,6 +14,7 @@
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/common/extension_set.h"
+#include "extensions/common/permissions/api_permission.h"
 
 namespace extensions {
 class ContentVerifier;
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");