Index: net/cert/test_root_certs_mac.cc |
diff --git a/net/cert/test_root_certs_mac.cc b/net/cert/test_root_certs_mac.cc |
index 87824d4c9ed19dd67177903c6ae69f6961b9480f..bcebdabc37f9e9369ab600f036fe0e2121c4bfb6 100644 |
--- a/net/cert/test_root_certs_mac.cc |
+++ b/net/cert/test_root_certs_mac.cc |
@@ -39,11 +39,8 @@ void ReleaseWrapper(CFAllocatorRef unused, const void* value) { |
// rather than checking if they were the same (logical) certificate, so a |
// custom structure is used for the array callbacks. |
const CFArrayCallBacks kCertArrayCallbacks = { |
- 0, // version |
- RetainWrapper, |
- ReleaseWrapper, |
- CFCopyDescription, |
- OurSecCertificateEqual, |
+ 0, // version |
+ RetainWrapper, ReleaseWrapper, CFCopyDescription, OurSecCertificateEqual, |
}; |
} // namespace |
@@ -73,8 +70,8 @@ OSStatus TestRootCerts::FixupSecTrustRef(SecTrustRef trust_ref) const { |
// being documented as available, it is not actually implemented. On 10.7+, |
// however, it always works. |
if (base::mac::IsOSLionOrLater()) { |
- OSStatus status = SecTrustSetAnchorCertificates(trust_ref, |
- temporary_roots_); |
+ OSStatus status = |
+ SecTrustSetAnchorCertificates(trust_ref, temporary_roots_); |
if (status) |
return status; |
return SecTrustSetAnchorCertificatesOnly(trust_ref, !allow_system_trust_); |
@@ -97,7 +94,8 @@ OSStatus TestRootCerts::FixupSecTrustRef(SecTrustRef trust_ref) const { |
base::ScopedCFTypeRef<CFArrayRef> scoped_system_roots(system_roots); |
base::ScopedCFTypeRef<CFMutableArrayRef> scoped_roots( |
CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, scoped_system_roots)); |
- CFArrayAppendArray(scoped_roots, temporary_roots_, |
+ CFArrayAppendArray(scoped_roots, |
+ temporary_roots_, |
CFRangeMake(0, CFArrayGetCount(temporary_roots_))); |
return SecTrustSetAnchorCertificates(trust_ref, scoped_roots); |
} |
@@ -106,11 +104,12 @@ void TestRootCerts::SetAllowSystemTrust(bool allow_system_trust) { |
allow_system_trust_ = allow_system_trust; |
} |
-TestRootCerts::~TestRootCerts() {} |
+TestRootCerts::~TestRootCerts() { |
+} |
void TestRootCerts::Init() { |
- temporary_roots_.reset(CFArrayCreateMutable(kCFAllocatorDefault, 0, |
- &kCertArrayCallbacks)); |
+ temporary_roots_.reset( |
+ CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCertArrayCallbacks)); |
allow_system_trust_ = true; |
} |