| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/cert/cert_database.h" | 5 #include "net/cert/cert_database.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "base/observer_list_threadsafe.h" | 8 #include "base/observer_list_threadsafe.h" |
| 9 | 9 |
| 10 namespace net { | 10 namespace net { |
| 11 | 11 |
| 12 // static | 12 // static |
| 13 CertDatabase* CertDatabase::GetInstance() { | 13 CertDatabase* CertDatabase::GetInstance() { |
| 14 // Leaky so it can be initialized on worker threads, and because there is no | 14 // Leaky so it can be initialized on worker threads, and because there is no |
| 15 // useful cleanup to do. | 15 // useful cleanup to do. |
| 16 return Singleton<CertDatabase, LeakySingletonTraits<CertDatabase> >::get(); | 16 return base::Singleton<CertDatabase, |
| 17 base::LeakySingletonTraits<CertDatabase>>::get(); |
| 17 } | 18 } |
| 18 | 19 |
| 19 void CertDatabase::AddObserver(Observer* observer) { | 20 void CertDatabase::AddObserver(Observer* observer) { |
| 20 observer_list_->AddObserver(observer); | 21 observer_list_->AddObserver(observer); |
| 21 } | 22 } |
| 22 | 23 |
| 23 void CertDatabase::RemoveObserver(Observer* observer) { | 24 void CertDatabase::RemoveObserver(Observer* observer) { |
| 24 observer_list_->RemoveObserver(observer); | 25 observer_list_->RemoveObserver(observer); |
| 25 } | 26 } |
| 26 | 27 |
| 27 void CertDatabase::NotifyObserversOfCertAdded(const X509Certificate* cert) { | 28 void CertDatabase::NotifyObserversOfCertAdded(const X509Certificate* cert) { |
| 28 observer_list_->Notify(FROM_HERE, &Observer::OnCertAdded, | 29 observer_list_->Notify(FROM_HERE, &Observer::OnCertAdded, |
| 29 make_scoped_refptr(cert)); | 30 make_scoped_refptr(cert)); |
| 30 } | 31 } |
| 31 | 32 |
| 32 void CertDatabase::NotifyObserversOfCertRemoved(const X509Certificate* cert) { | 33 void CertDatabase::NotifyObserversOfCertRemoved(const X509Certificate* cert) { |
| 33 observer_list_->Notify(FROM_HERE, &Observer::OnCertRemoved, | 34 observer_list_->Notify(FROM_HERE, &Observer::OnCertRemoved, |
| 34 make_scoped_refptr(cert)); | 35 make_scoped_refptr(cert)); |
| 35 } | 36 } |
| 36 | 37 |
| 37 void CertDatabase::NotifyObserversOfCACertChanged( | 38 void CertDatabase::NotifyObserversOfCACertChanged( |
| 38 const X509Certificate* cert) { | 39 const X509Certificate* cert) { |
| 39 observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, | 40 observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, |
| 40 make_scoped_refptr(cert)); | 41 make_scoped_refptr(cert)); |
| 41 } | 42 } |
| 42 | 43 |
| 43 } // namespace net | 44 } // namespace net |
| OLD | NEW |