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

chrome/browser/ui/webui/options/certificate_manager_handler.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/ui/webui/options/certificate_manager_handler.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 970 matching lines @@
   }
 }
 
 void CertificateManagerHandler::OnCertificateManagerModelCreated(
     scoped_ptr<CertificateManagerModel> model) {
   certificate_manager_model_ = model.Pass();
   CertificateManagerModelReady();
 }
 
 void CertificateManagerHandler::CertificateManagerModelReady() {
+  base::FundamentalValue user_db_available_value(
+      certificate_manager_model_->is_user_db_available());
   base::FundamentalValue tpm_available_value(
       certificate_manager_model_->is_tpm_available());
   web_ui()->CallJavascriptFunction("CertificateManager.onModelReady",
+                                   user_db_available_value,
                                    tpm_available_value);
   certificate_manager_model_->Refresh();
 }
 
 void CertificateManagerHandler::Populate(const base::ListValue* args) {
   if (certificate_manager_model_) {
     // Already have a model, the webui must be re-loading.  Just re-run the
     // webui initialization.
     CertificateManagerModelReady();
     return;
@@ skipping 124 matching lines @@
                                    title_value,
                                    error_value,
                                    cert_error_list);
 }
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
 }
 
 }  // namespace options