Consolidate manifest handler registration.

chrome/common/extensions/permissions/media_galleries_permission_unittest.cc

Index: chrome/common/extensions/permissions/media_galleries_permission_unittest.cc
diff --git a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc
index 27ba20c46e4de022f3c3297c5884ec5c9719464c..f743050c35307b51e58a1fcd1e00f16835ec856e 100644
--- a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc
+++ b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc
@@ -5,9 +5,10 @@
 // These tests make sure MediaGalleriesPermission values are parsed correctly.
 
 #include "base/values.h"
-#include "chrome/common/extensions/extension_unittest.h"
+#include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission_data.h"
+#include "chrome/common/extensions/permissions/permissions_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::SocketPermissionRequest;
@@ -17,10 +18,7 @@ namespace extensions {
 
 namespace {
 
-class MediaGalleriesPermissionTest : public ExtensionTest {
-};
-
-TEST_F(MediaGalleriesPermissionTest, GoodValues) {
+TEST(MediaGalleriesPermissionTest, GoodValues) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
 
@@ -50,7 +48,7 @@ TEST_F(MediaGalleriesPermissionTest, GoodValues) {
   EXPECT_TRUE(permission->FromValue(value.get()));
 }
 
-TEST_F(MediaGalleriesPermissionTest, BadValues) {
+TEST(MediaGalleriesPermissionTest, BadValues) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
 
@@ -62,7 +60,7 @@ TEST_F(MediaGalleriesPermissionTest, BadValues) {
   EXPECT_FALSE(permission->FromValue(value.get()));
 }
 
-TEST_F(MediaGalleriesPermissionTest, Equal) {
+TEST(MediaGalleriesPermissionTest, Equal) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
 
@@ -90,7 +88,7 @@ TEST_F(MediaGalleriesPermissionTest, Equal) {
   EXPECT_TRUE(permission1->Equal(permission2.get()));
 }
 
-TEST_F(MediaGalleriesPermissionTest, ToFromValue) {
+TEST(MediaGalleriesPermissionTest, ToFromValue) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);