Fix WeakPtr's thread restriction violation in chromeos::CertLibrary

chrome/browser/chromeos/cros/cert_library.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 "chrome/browser/chromeos/cros/cert_library.h"
 
 #include <algorithm>
 
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list_threadsafe.h"
@@ skipping 81 matching lines @@
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 
 namespace chromeos {
 
 //////////////////////////////////////////////////////////////////////////////
 
+// base::Unretained(this) in the class is safe. By the time this object is
+// deleted as part of CrosLibrary, the DB thread and the UI message loop
+// are already terminated.
 class CertLibraryImpl
     : public CertLibrary,
       public net::CertDatabase::Observer {
  public:
   typedef ObserverListThreadSafe<CertLibrary::Observer> CertLibraryObserverList;
 
   CertLibraryImpl() :
       observer_list_(new CertLibraryObserverList),
       user_logged_in_(false),
       certificates_requested_(false),
@@ skipping 120 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   }
 
   virtual void OnUserCertAdded(const net::X509Certificate* cert) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     // Only load certificates if we have completed an initial request.
     if (certificates_loaded_) {
       BrowserThread::PostTask(
           BrowserThread::DB, FROM_HERE,
           base::Bind(&CertLibraryImpl::LoadCertificates,
-                     weak_ptr_factory_.GetWeakPtr()));
+                     base::Unretained(this)));
     }
   }
 
   virtual void OnUserCertRemoved(const net::X509Certificate* cert) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     // Only load certificates if we have completed an initial request.
     if (certificates_loaded_) {
       BrowserThread::PostTask(
           BrowserThread::DB, FROM_HERE,
           base::Bind(&CertLibraryImpl::LoadCertificates,
-                     weak_ptr_factory_.GetWeakPtr()));
+                     base::Unretained(this)));
     }
   }
 
   virtual const std::string& GetTpmTokenName() const OVERRIDE {
     return tpm_token_name_;
   }
 
  private:
   void LoadCertificates() {
     VLOG(1) << " Loading Certificates.";
     // Certificate fetch occurs on the DB thread.
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     net::CertDatabase cert_db;
     net::CertificateList* cert_list = new net::CertificateList();
     cert_db.ListCerts(cert_list);
     // Pass the list to the UI thread to safely update the local lists.
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&CertLibraryImpl::UpdateCertificates,
-                   weak_ptr_factory_.GetWeakPtr(), cert_list));
+                   base::Unretained(this), cert_list));
   }
 
   // Comparison functor for locale-sensitive sorting of certificates by name.
   class CertNameComparator {
    public:
     explicit CertNameComparator(icu::Collator* collator)
         : collator_(collator) { }
 
     bool operator()(const scoped_refptr<net::X509Certificate>& lhs,
                     const scoped_refptr<net::X509Certificate>& rhs) const {
@@ skipping 119 matching lines @@
         }
         return;
       }
       // TPM is not enabled, so proceed with empty tpm token name.
       VLOG(1) << "TPM not available.";
     }
 
     // tpm_token_name_ is set, load the certificates on the DB thread.
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
-        base::Bind(&CertLibraryImpl::LoadCertificates,
-                   weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&CertLibraryImpl::LoadCertificates, base::Unretained(this)));
   }
 
   // Observers.
   const scoped_refptr<CertLibraryObserverList> observer_list_;
 
   // Active request task for re-requests while waiting for TPM init.
   base::Closure request_task_;
 
   // Cached TPM token name.
   std::string tpm_token_name_;
@@ skipping 79 matching lines @@
     net::X509Certificate* cert = GetCertificateAt(index);
     net::X509Certificate::OSCertHandle cert_handle = cert->os_cert_handle();
     std::string id = x509_certificate_model::GetPkcs11Id(cert_handle);
     if (id == pkcs11_id)
       return index;
   }
   return -1;  // Not found.
 }
 
 }  // chromeos