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

chrome/browser/ui/webui/options/certificate_manager_browsertest.js

 // 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.
 
 // Mac and Windows go to native certificate manager, and certificate manager
 // isn't implemented if OpenSSL is used.
 GEN('#if defined(USE_NSS)');
 
 /**
  * TestFixture for certificate manager WebUI testing.
@@ skipping 76 matching lines @@
   expectTrue($('caCertsTab-export').disabled);
   expectTrue($('caCertsTab-delete').disabled);
   expectTrue($('caCertsTab-import').disabled);
 
   expectTrue($('otherCertsTab-view').disabled);
   expectTrue($('otherCertsTab-export').disabled);
   expectTrue($('otherCertsTab-delete').disabled);
 
   Mock4JS.verifyAllMocks();
 
+  // If user database is not available, import buttons should be disabled.
+  CertificateManager.onModelReady(false /* userDbAvailable*/,
+                                  false /* tpmAvailable */);
+
+  expectTrue($('personalCertsTab-import').disabled);
+  expectTrue($('serverCertsTab-import').disabled);
+  expectTrue($('caCertsTab-import').disabled);
+
   // Once we get the onModelReady call, the import buttons should be enabled,
   // others should still be disabled.
-  CertificateManager.onModelReady(false /* tpm_available */);
+  CertificateManager.onModelReady(true /* userDbAvailable*/,
+                                  false /* tpmAvailable */);
 
   expectTrue($('personalCertsTab-view').disabled);
   expectTrue($('personalCertsTab-backup').disabled);
   expectTrue($('personalCertsTab-delete').disabled);
   expectFalse($('personalCertsTab-import').disabled);
 
   expectTrue($('serverCertsTab-view').disabled);
   expectTrue($('serverCertsTab-export').disabled);
   expectTrue($('serverCertsTab-delete').disabled);
   expectFalse($('serverCertsTab-import').disabled);
 
   expectTrue($('caCertsTab-view').disabled);
   expectTrue($('caCertsTab-edit').disabled);
   expectTrue($('caCertsTab-export').disabled);
   expectTrue($('caCertsTab-delete').disabled);
   expectFalse($('caCertsTab-import').disabled);
 
   expectTrue($('otherCertsTab-view').disabled);
   expectTrue($('otherCertsTab-export').disabled);
   expectTrue($('otherCertsTab-delete').disabled);
 
   // On ChromeOS, the import and bind button should only be enabled if TPM is
   // present.
   if (this.isChromeOS) {
     expectTrue($('personalCertsTab-import-and-bind').disabled);
-    CertificateManager.onModelReady(true /* tpm_available */);
+    CertificateManager.onModelReady(true /* userDbAvailable*/,
+                                    true /* tpmAvailable */);
     expectFalse($('personalCertsTab-import-and-bind').disabled);
   }
 });
 
 /**
  * TestFixture for certificate manager WebUI testing.
  * @extends {CertificateManagerWebUIBaseTest}
  * @constructor
  **/
 function CertificateManagerWebUITest() {}
 
 CertificateManagerWebUITest.prototype = {
   __proto__: CertificateManagerWebUIBaseTest.prototype,
 
   /** @inheritDoc */
   preLoad: function() {
     CertificateManagerWebUIBaseTest.prototype.preLoad.call(this);
 
-    var tpm_available = this.isChromeOS;
+    var tpmAvailable = this.isChromeOS;
+    var userDbAvailable = true;
     this.mockHandler.expects(once()).populateCertificateManager().will(
         callFunction(function() {
-          CertificateManager.onModelReady(tpm_available);
+          CertificateManager.onModelReady(userDbAvailable, tpmAvailable);
 
           [['personalCertsTab-tree',
               [{'id': 'o1',
                 'name': 'org1',
                 'subnodes': [{ 'id': 'c1',
                                'name': 'cert1',
                                'readonly': false,
                                'untrusted': false,
                                'extractable': true }],
                }],
@@ skipping 102 matching lines @@
   // edit and delete buttons should be disabled.
   var cert1 = certs[1];
   expectEquals('ca_cert1', cert1.data.name);
   expectNotEquals(null, cert1.querySelector('.cert-policy'));
   cert1.click();
   expectTrue($('caCertsTab-edit').disabled);
   expectTrue($('caCertsTab-delete').disabled);
 });
 
 GEN('#endif  // defined(USE_NSS)');