summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/permissions
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 06:40:47 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 06:40:47 +0000
commitd592b1bd3f4cbf2e79c49a7efb9fed1a94f30a72 (patch)
treeec48741e2d3b7b9497a4a2d743817ac569ac4f13 /chrome/browser/extensions/api/permissions
parent1db38953838ce147ee0d599b63bec1326e983f7a (diff)
downloadchromium_src-d592b1bd3f4cbf2e79c49a7efb9fed1a94f30a72.zip
chromium_src-d592b1bd3f4cbf2e79c49a7efb9fed1a94f30a72.tar.gz
chromium_src-d592b1bd3f4cbf2e79c49a7efb9fed1a94f30a72.tar.bz2
Consolidate manifest handler registration.
BUG=229467 Review URL: https://chromiumcodereview.appspot.com/14694010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/permissions')
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index 2cfc545..28c94ac 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -6,7 +6,6 @@
#include "base/values.h"
#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/common/extensions/api/permissions.h"
-#include "chrome/common/extensions/extension_unittest.h"
#include "chrome/common/extensions/permissions/permission_set.h"
#include "extensions/common/url_pattern_set.h"
#include "googleurl/src/gurl.h"
@@ -27,11 +26,8 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
} // namespace
-class ExtensionPermissionsAPIHelpers : public ExtensionTest {
-};
-
// Tests that we can convert PermissionSets to and from values.
-TEST_F(ExtensionPermissionsAPIHelpers, Pack) {
+TEST(ExtensionPermissionsAPIHelpers, Pack) {
APIPermissionSet apis;
apis.insert(APIPermission::kTab);
apis.insert(APIPermission::kWebRequest);
@@ -80,7 +76,7 @@ TEST_F(ExtensionPermissionsAPIHelpers, Pack) {
// Tests various error conditions and edge cases when unpacking values
// into PermissionSets.
-TEST_F(ExtensionPermissionsAPIHelpers, Unpack) {
+TEST(ExtensionPermissionsAPIHelpers, Unpack) {
scoped_ptr<ListValue> apis(new ListValue());
apis->Append(Value::CreateStringValue("tabs"));
scoped_ptr<ListValue> origins(new ListValue());