Consolidate manifest handler registration.

chrome/common/extensions/permissions/api_permission_set_unittest.cc

Index: chrome/common/extensions/permissions/api_permission_set_unittest.cc
diff --git a/chrome/common/extensions/permissions/api_permission_set_unittest.cc b/chrome/common/extensions/permissions/api_permission_set_unittest.cc
index 1b8f6c76ddaea60408a939f7aeb71912fc1961dd..6ff579ac14ad470c5c1e6a1126a357cb585da689 100644
--- a/chrome/common/extensions/permissions/api_permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/api_permission_set_unittest.cc
@@ -5,17 +5,14 @@
 #include "base/pickle.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/extension_unittest.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
+#include "chrome/common/extensions/permissions/permissions_info.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
-class APIPermissionSetTest : public ExtensionTest {
-};
-
-TEST_F(APIPermissionSetTest, General) {
+TEST(APIPermissionSetTest, General) {
   APIPermissionSet apis;
   apis.insert(APIPermission::kTab);
   apis.insert(APIPermission::kBackground);
@@ -35,7 +32,7 @@ TEST_F(APIPermissionSetTest, General) {
   EXPECT_EQ(apis.size(), 4u);
 }
 
-TEST_F(APIPermissionSetTest, CreateUnion) {
+TEST(APIPermissionSetTest, CreateUnion) {
   APIPermission* permission = NULL;
 
   APIPermissionSet apis1;
@@ -123,7 +120,7 @@ TEST_F(APIPermissionSetTest, CreateUnion) {
   EXPECT_EQ(expected_apis, result);
 }
 
-TEST_F(APIPermissionSetTest, CreateIntersection) {
+TEST(APIPermissionSetTest, CreateIntersection) {
   APIPermission* permission = NULL;
 
   APIPermissionSet apis1;
@@ -201,7 +198,7 @@ TEST_F(APIPermissionSetTest, CreateIntersection) {
   EXPECT_EQ(expected_apis, result);
 }
 
-TEST_F(APIPermissionSetTest, CreateDifference) {
+TEST(APIPermissionSetTest, CreateDifference) {
   APIPermission* permission = NULL;
 
   APIPermissionSet apis1;
@@ -272,7 +269,7 @@ TEST_F(APIPermissionSetTest, CreateDifference) {
   EXPECT_TRUE(result2.empty());
 }
 
-TEST_F(APIPermissionSetTest, IPC) {
+TEST(APIPermissionSetTest, IPC) {
   APIPermission* permission = NULL;
 
   APIPermissionSet apis;