| Index: net/cert/ev_root_ca_metadata_unittest.cc
|
| diff --git a/net/cert/ev_root_ca_metadata_unittest.cc b/net/cert/ev_root_ca_metadata_unittest.cc
|
| index 1bb547565fd5100d69422d2c688aed64b2cd6bc9..6525a6e4c098f9ff1352b8e05a23187faefa1718 100644
|
| --- a/net/cert/ev_root_ca_metadata_unittest.cc
|
| +++ b/net/cert/ev_root_ca_metadata_unittest.cc
|
| @@ -20,12 +20,12 @@ namespace {
|
| const char kVerisignPolicy[] = "2.16.840.1.113733.1.7.23.6";
|
| const char kThawtePolicy[] = "2.16.840.1.113733.1.7.48.1";
|
| const char kFakePolicy[] = "2.16.840.1.42";
|
| -const SHA1HashValue kVerisignFingerprint =
|
| - { { 0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45,
|
| - 0x49, 0x54, 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2 } };
|
| -const SHA1HashValue kFakeFingerprint =
|
| - { { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
|
| - 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 } };
|
| +const SHA1HashValue kVerisignFingerprint = {
|
| + {0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45, 0x49, 0x54,
|
| + 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2}};
|
| +const SHA1HashValue kFakeFingerprint = {
|
| + {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11,
|
| + 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99}};
|
|
|
| class EVOidData {
|
| public:
|
| @@ -72,8 +72,7 @@ bool EVOidData::Init() {
|
| fake_policy = RegisterOID(pool.get(), kFakePolicy);
|
|
|
| return verisign_policy != SEC_OID_UNKNOWN &&
|
| - thawte_policy != SEC_OID_UNKNOWN &&
|
| - fake_policy != SEC_OID_UNKNOWN;
|
| + thawte_policy != SEC_OID_UNKNOWN && fake_policy != SEC_OID_UNKNOWN;
|
| }
|
|
|
| #elif defined(OS_WIN)
|
| @@ -94,9 +93,7 @@ bool EVOidData::Init() {
|
|
|
| class EVRootCAMetadataTest : public testing::Test {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| - ASSERT_TRUE(ev_oid_data.Init());
|
| - }
|
| + virtual void SetUp() OVERRIDE { ASSERT_TRUE(ev_oid_data.Init()); }
|
|
|
| EVOidData ev_oid_data;
|
| };
|
| @@ -120,21 +117,21 @@ TEST_F(EVRootCAMetadataTest, AddRemove) {
|
| EVRootCAMetadata* ev_metadata(EVRootCAMetadata::GetInstance());
|
|
|
| EXPECT_FALSE(ev_metadata->IsEVPolicyOID(ev_oid_data.fake_policy));
|
| - EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
|
| - ev_oid_data.fake_policy));
|
| + EXPECT_FALSE(
|
| + ev_metadata->HasEVPolicyOID(kFakeFingerprint, ev_oid_data.fake_policy));
|
|
|
| {
|
| - ScopedTestEVPolicy test_ev_policy(ev_metadata, kFakeFingerprint,
|
| - kFakePolicy);
|
| + ScopedTestEVPolicy test_ev_policy(
|
| + ev_metadata, kFakeFingerprint, kFakePolicy);
|
|
|
| EXPECT_TRUE(ev_metadata->IsEVPolicyOID(ev_oid_data.fake_policy));
|
| - EXPECT_TRUE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
|
| - ev_oid_data.fake_policy));
|
| + EXPECT_TRUE(
|
| + ev_metadata->HasEVPolicyOID(kFakeFingerprint, ev_oid_data.fake_policy));
|
| }
|
|
|
| EXPECT_FALSE(ev_metadata->IsEVPolicyOID(ev_oid_data.fake_policy));
|
| - EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
|
| - ev_oid_data.fake_policy));
|
| + EXPECT_FALSE(
|
| + ev_metadata->HasEVPolicyOID(kFakeFingerprint, ev_oid_data.fake_policy));
|
| }
|
|
|
| #endif // defined(USE_NSS) || defined(OS_WIN)
|
|
|