Index: chrome/browser/extensions/api/permissions/permissions_apitest.cc |
diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc |
index 252038e0c3a94d188bdd8fa65bc7af50e13d9bc6..fd07016a182f0b38a3939fff259e37ba84f2cf43 100644 |
--- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc |
+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc |
@@ -9,9 +9,13 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/extensions/extension_permission_set.h" |
+#include "chrome/common/extensions/permissions/permission_set.h" |
#include "net/base/mock_host_resolver.h" |
+using extensions::APIPermission; |
+using extensions::APIPermissionSet; |
+using extensions::PermissionSet; |
+ |
namespace { |
static void AddPattern(URLPatternSet* extent, const std::string& pattern) { |
@@ -68,12 +72,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_AlwaysAllowed) { |
// Tests that the optional permissions API works correctly. |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGranted) { |
// Mark all the tested APIs as granted to bypass the confirmation UI. |
- ExtensionAPIPermissionSet apis; |
- apis.insert(ExtensionAPIPermission::kTab); |
+ APIPermissionSet apis; |
+ apis.insert(APIPermission::kTab); |
URLPatternSet explicit_hosts; |
AddPattern(&explicit_hosts, "http://*.c.com/*"); |
- scoped_refptr<ExtensionPermissionSet> granted_permissions = |
- new ExtensionPermissionSet(apis, explicit_hosts, URLPatternSet()); |
+ scoped_refptr<PermissionSet> granted_permissions = |
+ new PermissionSet(apis, explicit_hosts, URLPatternSet()); |
ExtensionPrefs* prefs = |
browser()->profile()->GetExtensionService()->extension_prefs(); |