Merge 257570 "Handle cases when user cert database has NULL slots"

chrome/browser/certificate_manager_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 #define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 38 matching lines @@
 
   // Creates a CertificateManagerModel. The model will be passed to the callback
   // when it is ready. The caller must ensure the model does not outlive the
   // |browser_context|.
   static void Create(content::BrowserContext* browser_context,
                      Observer* observer,
                      const CreationCallback& callback);
 
   ~CertificateManagerModel();
 
+  bool is_user_db_available() const { return is_user_db_available_; }
   bool is_tpm_available() const { return is_tpm_available_; }
 
   // Accessor for read-only access to the underlying NSSCertDatabase.
   const net::NSSCertDatabase* cert_db() const { return cert_db_; }
 
   // Trigger a refresh of the list of certs, unlock any slots if necessary.
   // Following this call, the observer CertificatesRefreshed method will be
   // called so the view can call FilterAndBuildOrgGroupingMap as necessary to
   // refresh its tree views.
   void Refresh();
@@ skipping 48 matching lines @@
 
   // Delete the cert.  Returns true on success.  |cert| is still valid when this
   // function returns.
   bool Delete(net::X509Certificate* cert);
 
   // IsHardwareBacked returns true if |cert| is hardware backed.
   bool IsHardwareBacked(const net::X509Certificate* cert) const;
 
  private:
   CertificateManagerModel(net::NSSCertDatabase* nss_cert_database,
+                          bool is_user_db_available,
                           bool is_tpm_available,
                           Observer* observer);
 
   // Methods used during initialization, see the comment at the top of the .cc
   // file for details.
   static void DidGetCertDBOnUIThread(
       net::NSSCertDatabase* cert_db,
+      bool is_user_db_available,
       bool is_tpm_available,
       CertificateManagerModel::Observer* observer,
       const CreationCallback& callback);
   static void DidGetCertDBOnIOThread(
       CertificateManagerModel::Observer* observer,
       const CreationCallback& callback,
       net::NSSCertDatabase* cert_db);
   static void GetCertDBOnIOThread(content::ResourceContext* context,
                                   CertificateManagerModel::Observer* observer,
                                   const CreationCallback& callback);
 
   // Callback used by Refresh() for when the cert slots have been unlocked.
   // This method does the actual refreshing.
   void RefreshSlotsUnlocked();
 
   net::NSSCertDatabase* cert_db_;
   net::CertificateList cert_list_;
+  // Whether the certificate database has a public slot associated with the
+  // profile. If not set, importing certificates is not allowed with this model.
+  bool is_user_db_available_;
   bool is_tpm_available_;
 
   // The observer to notify when certificate list is refreshed.
   Observer* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateManagerModel);
 };
 
 #endif  // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_