Consolidate manifest handler registration.

chrome/common/extensions/permissions/socket_permission_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/values.h"
-#include "chrome/common/extensions/extension_unittest.h"
+#include "chrome/common/extensions/permissions/permissions_info.h"
 #include "chrome/common/extensions/permissions/socket_permission.h"
 #include "chrome/common/extensions/permissions/socket_permission_data.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
 using content::SocketPermissionRequest;
 
 void ParseTest(const std::string& permission,
                const std::string& expected_result) {
   SocketPermissionData data;
   ASSERT_TRUE(data.ParseForTest(permission)) << "Parse permission \""
                                              << permission << "\" failed.";
   EXPECT_EQ(expected_result, data.GetAsStringForTest());
 }
 
-class SocketPermissionTest : public ExtensionTest {
-};
-
-TEST_F(SocketPermissionTest, General) {
+TEST(SocketPermissionTest, General) {
   SocketPermissionData data1, data2;
 
   CHECK(data1.ParseForTest("tcp-connect"));
   CHECK(data2.ParseForTest("tcp-connect"));
 
   EXPECT_TRUE(data1 == data2);
   EXPECT_FALSE(data1 < data2);
 
   CHECK(data1.ParseForTest("tcp-connect"));
   CHECK(data2.ParseForTest("tcp-connect:www.example.com"));
 
   EXPECT_FALSE(data1 == data2);
   EXPECT_TRUE(data1 < data2);
 }
 
-TEST_F(SocketPermissionTest, Parse) {
+TEST(SocketPermissionTest, Parse) {
   SocketPermissionData data;
 
   EXPECT_FALSE(data.ParseForTest(std::string()));
   EXPECT_FALSE(data.ParseForTest("*"));
   EXPECT_FALSE(data.ParseForTest("\00\00*"));
   EXPECT_FALSE(data.ParseForTest("\01*"));
   EXPECT_FALSE(data.ParseForTest("tcp-connect:www.example.com:-1"));
   EXPECT_FALSE(data.ParseForTest("tcp-connect:www.example.com:65536"));
   EXPECT_FALSE(data.ParseForTest("tcp-connect:::"));
   EXPECT_FALSE(data.ParseForTest("tcp-connect::0"));
@@ skipping 53 matching lines @@
   ParseTest("tcp-connect::99", "tcp-connect:*:99");
   ParseTest("tcp-listen::99", "tcp-listen:*:99");
   ParseTest("udp-bind::99", "udp-bind:*:99");
   ParseTest("udp-send-to::99", "udp-send-to:*:99");
 
   ParseTest("tcp-connect:www.example.com", "tcp-connect:www.example.com:*");
 
   ParseTest("tcp-connect:*.example.com:99", "tcp-connect:*.example.com:99");
 }
 
-TEST_F(SocketPermissionTest, Match) {
+TEST(SocketPermissionTest, Match) {
   SocketPermissionData data;
   scoped_ptr<SocketPermission::CheckParam> param;
 
   CHECK(data.ParseForTest("tcp-connect"));
   param.reset(new SocketPermission::CheckParam(
         SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80));
   EXPECT_TRUE(data.Check(param.get()));
   param.reset(new SocketPermission::CheckParam(
         SocketPermissionRequest::UDP_SEND_TO, "www.example.com", 80));
   EXPECT_FALSE(data.Check(param.get()));
@@ skipping 79 matching lines @@
         SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80));
   EXPECT_FALSE(data.Check(param.get()));
   param.reset(new SocketPermission::CheckParam(
         SocketPermissionRequest::UDP_SEND_TO, "www.google.com", 8800));
   EXPECT_FALSE(data.Check(param.get()));
   param.reset(new SocketPermission::CheckParam(
         SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP, "127.0.0.1", 35));
   EXPECT_TRUE(data.Check(param.get()));
 }
 
-TEST_F(SocketPermissionTest, IPC) {
+TEST(SocketPermissionTest, IPC) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
 
   {
     IPC::Message m;
 
     scoped_ptr<APIPermission> permission1(
         permission_info->CreateAPIPermission());
     scoped_ptr<APIPermission> permission2(
         permission_info->CreateAPIPermission());
@@ skipping 21 matching lines @@
 
     EXPECT_FALSE(permission1->Equal(permission2.get()));
 
     permission1->Write(&m);
     PickleIterator iter(m);
     permission2->Read(&m, &iter);
     EXPECT_TRUE(permission1->Equal(permission2.get()));
   }
 }
 
-TEST_F(SocketPermissionTest, Value) {
+TEST(SocketPermissionTest, Value) {
   const APIPermissionInfo* permission_info =
     PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
 
   scoped_ptr<APIPermission> permission1(
       permission_info->CreateAPIPermission());
   scoped_ptr<APIPermission> permission2(
       permission_info->CreateAPIPermission());
 
   scoped_ptr<base::ListValue> value(new base::ListValue());
   value->AppendString("tcp-connect:*.example.com:80");
   value->AppendString("udp-bind::8080");
   value->AppendString("udp-send-to::8888");
   ASSERT_TRUE(permission1->FromValue(value.get()));
 
   EXPECT_FALSE(permission1->Equal(permission2.get()));
 
   scoped_ptr<base::Value> vtmp(permission1->ToValue());
   ASSERT_TRUE(vtmp);
   ASSERT_TRUE(permission2->FromValue(vtmp.get()));
   EXPECT_TRUE(permission1->Equal(permission2.get()));
 }
 
 }  // namespace
 
 }  // namespace extensions