Chromium Code Reviews| Index: chromeos/cert_loader.h |
| diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h |
| index 94f6a4114fb67ddc0dd7d83743df76ffb81088db..16ae63a4e323bbef7d3a94c74a6429cfde67c7f8 100644 |
| --- a/chromeos/cert_loader.h |
| +++ b/chromeos/cert_loader.h |
| @@ -17,10 +17,6 @@ |
| #include "chromeos/chromeos_export.h" |
| #include "net/cert/cert_database.h" |
| -namespace base { |
| -class TaskRunner; |
| -} |
| - |
| namespace net { |
| class NSSCertDatabase; |
| class X509Certificate; |
| @@ -64,14 +60,10 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer { |
| static std::string GetPkcs11IdForCert(const net::X509Certificate& cert); |
| // Starts the CertLoader with the NSS cert database. |
| - // The CertLoader will _not_ take the ownership of the database. |
| + // The CertLoader will _not_ take the ownership of the database, but it |
| + // expexts it to stay alive at least until the shutdown of the main thread. |
|
mattm
2014/01/30 04:34:37
expects
mattm
2014/01/30 04:34:37
This doesn't seem true, or maybe just confusingly
tbarzic
2014/02/03 23:42:05
Not worded precisely enough. It should be:
"it exp
tbarzic
2014/02/03 23:42:05
Done.
|
| void StartWithNSSDB(net::NSSCertDatabase* database); |
| - // Sets the task runner that any slow calls will be made from, e.g. calls |
| - // to the NSS database. If not set, uses base::WorkerPool. |
| - void SetSlowTaskRunnerForTest( |
| - const scoped_refptr<base::TaskRunner>& task_runner); |
| - |
| void AddObserver(CertLoader::Observer* observer); |
| void RemoveObserver(CertLoader::Observer* observer); |
| @@ -104,7 +96,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer { |
| void LoadCertificates(); |
| // Called if a certificate load task is finished. |
| - void UpdateCertificates(net::CertificateList* cert_list); |
| + void UpdateCertificates(scoped_ptr<net::CertificateList> cert_list); |
| void NotifyCertificatesLoaded(bool initial_load); |
| @@ -132,10 +124,6 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer { |
| base::ThreadChecker thread_checker_; |
| - // TaskRunner that, if set, replaces base::WorkerPool. Should only be set in |
| - // tests. |
| - scoped_refptr<base::TaskRunner> slow_task_runner_for_test_; |
| - |
| base::WeakPtrFactory<CertLoader> weak_factory_; |
| DISALLOW_COPY_AND_ASSIGN(CertLoader); |