Cleanup unreachable cert adding code

net/cert/cert_database_mac.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 "net/cert/cert_database.h"
 
 #include <Security/Security.h>
 
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 86 matching lines @@
     // that they have already been handled. This may miss events that
     // originated as a result of spawning native dialogs that allow the user
     // to modify Keychain settings. However, err on the side of missing
     // events rather than sending too many events.
     return errSecSuccess;
   }
 
   switch (keychain_event) {
     case kSecKeychainListChangedEvent:
     case kSecTrustSettingsChangedEvent:
-      that->cert_db_->NotifyObserversOfCACertChanged(NULL);
+      that->cert_db_->NotifyObserversCertDBChanged(NULL);
       break;
 
     default:
       break;
   }
 
   return errSecSuccess;
 }
 
 void CertDatabase::SetMessageLoopForKeychainEvents() {
   // Shutdown will take care to delete the notifier on the right thread.
   if (notifier_.get())
     notifier_.release()->Shutdown();
 
   notifier_.reset(new Notifier(this, base::MessageLoopForUI::current()));
 }
 
 CertDatabase::CertDatabase()
     : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {
   // Shutdown will take care to delete the notifier on the right thread.
   if (notifier_.get())
     notifier_.release()->Shutdown();

[Ryan Sleevi, 2016/09/22 08:44:29]

In the future, cleaning this up would allow eliminating of all of the ctor/dtor
duplication in the per-platform files.

 }
 
-int CertDatabase::CheckUserCert(X509Certificate* cert) {
-  if (!cert)
-    return ERR_CERT_INVALID;
-  if (cert->HasExpired())
-    return ERR_CERT_DATE_INVALID;
-
-  // Verify the Keychain already has the corresponding private key:
-  SecIdentityRef identity = NULL;
-  OSStatus err = SecIdentityCreateWithCertificate(NULL, cert->os_cert_handle(),
-                                                  &identity);
-  if (err == errSecItemNotFound)
-    return ERR_NO_PRIVATE_KEY_FOR_CERT;
-
-  if (err != noErr || !identity) {
-    // TODO(snej): Map the error code more intelligently.
-    return ERR_CERT_INVALID;
-  }
-
-  CFRelease(identity);
-  return OK;
-}
-
-int CertDatabase::AddUserCert(X509Certificate* cert) {
-  OSStatus err;
-  {
-    base::AutoLock locked(crypto::GetMacSecurityServicesLock());
-    err = SecCertificateAddToKeychain(cert->os_cert_handle(), NULL);
-  }
-  switch (err) {
-    case noErr:
-      CertDatabase::NotifyObserversOfCertAdded(cert);
-      // Fall through.
-    case errSecDuplicateItem:
-      return OK;
-    default:
-      OSSTATUS_LOG(ERROR, err) << "CertDatabase failed to add cert to keychain";
-      // TODO(snej): Map the error code more intelligently.
-      return ERR_ADD_USER_CERT_FAILED;
-  }
-}
-
 }  // namespace net