| Index: net/cert/cert_database_mac.cc
|
| diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
|
| index 3f405f33a69280dde51eb07bad878d78705eb42b..cf3d26ea2b103d16e683f94b06f68a0a9c792c3e 100644
|
| --- a/net/cert/cert_database_mac.cc
|
| +++ b/net/cert/cert_database_mac.cc
|
| @@ -27,15 +27,12 @@ class CertDatabase::Notifier {
|
| // |message_loop| must refer to a thread with an associated CFRunLoop - a
|
| // TYPE_UI thread. Events will be dispatched from this message loop.
|
| Notifier(CertDatabase* cert_db, base::MessageLoop* message_loop)
|
| - : cert_db_(cert_db),
|
| - registered_(false),
|
| - called_shutdown_(false) {
|
| + : cert_db_(cert_db), registered_(false), called_shutdown_(false) {
|
| // Ensure an associated CFRunLoop.
|
| DCHECK(base::MessageLoopForUI::IsCurrent());
|
| task_runner_ = message_loop->message_loop_proxy();
|
| task_runner_->PostTask(FROM_HERE,
|
| - base::Bind(&Notifier::Init,
|
| - base::Unretained(this)));
|
| + base::Bind(&Notifier::Init, base::Unretained(this)));
|
| }
|
|
|
| // Should be called from the |task_runner_|'s thread. Use Shutdown()
|
| @@ -61,8 +58,8 @@ class CertDatabase::Notifier {
|
| void Init() {
|
| SecKeychainEventMask event_mask =
|
| kSecKeychainListChangedMask | kSecTrustSettingsChangedEventMask;
|
| - OSStatus status = SecKeychainAddCallback(&Notifier::KeychainCallback,
|
| - event_mask, this);
|
| + OSStatus status =
|
| + SecKeychainAddCallback(&Notifier::KeychainCallback, event_mask, this);
|
| if (status == noErr)
|
| registered_ = true;
|
| }
|
| @@ -136,8 +133,8 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) {
|
|
|
| // Verify the Keychain already has the corresponding private key:
|
| SecIdentityRef identity = NULL;
|
| - OSStatus err = SecIdentityCreateWithCertificate(NULL, cert->os_cert_handle(),
|
| - &identity);
|
| + OSStatus err =
|
| + SecIdentityCreateWithCertificate(NULL, cert->os_cert_handle(), &identity);
|
| if (err == errSecItemNotFound)
|
| return ERR_NO_PRIVATE_KEY_FOR_CERT;
|
|
|
| @@ -159,7 +156,7 @@ int CertDatabase::AddUserCert(X509Certificate* cert) {
|
| switch (err) {
|
| case noErr:
|
| CertDatabase::NotifyObserversOfCertAdded(cert);
|
| - // Fall through.
|
| + // Fall through.
|
| case errSecDuplicateItem:
|
| return OK;
|
| default:
|
|
|