diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:51:16 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:51:16 +0000 |
| commit | 7030a0beed4faba33202f25516469ab7c4ba3853 (patch) | |
| tree | 7499a7c03d38a358527af8c61d2e9389cd8b332a | |
| parent | e14665dd6cf2468313b0386b76da860e201d2b16 (diff) | |
| download | chromium_src-7030a0beed4faba33202f25516469ab7c4ba3853.zip chromium_src-7030a0beed4faba33202f25516469ab7c4ba3853.tar.gz chromium_src-7030a0beed4faba33202f25516469ab7c4ba3853.tar.bz2 | |
Elim. CHECK in ~CertLibraryImpl
The check here was a bad idea in the first place, I didn't think this through carefully enough.
BUG=chromium-os:18677
TEST=Run chrome, open vpn or 8021x connection dialog, quit; ensure chrome does not crash.
Review URL: http://codereview.chromium.org/7578010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95485 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/cert_library.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index f44c776..4c4709c 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -81,11 +81,9 @@ class CertLibraryImpl } ~CertLibraryImpl() { - CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (request_task_) { - request_task_->Cancel(); - request_task_ = NULL; - } + // CertLibraryImpl is a singleton, so do not attempt to cleanup + // request_task_ on destruction. + DCHECK(request_task_ == NULL); net::CertDatabase::RemoveObserver(this); } |