Merge 146920 - Fix certificate manager buttons never becoming clickable.

chrome/browser/resources/options2/certificate_manager.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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
 
   /////////////////////////////////////////////////////////////////////////////
   // CertificateManagerTab class:
 
@@ skipping 96 matching lines @@
   }
 
   CertificateManagerTab.prototype = {
 
     /**
      * Update button state.
      * @private
      * @param {!Object} data The data of the selected item.
      */
     updateButtonState: function(data) {
-      var isCert = !!data && data.id.substr(0, 5) == 'cert-';
+      var isCert = !!data && data.isCert;
       var readOnly = !!data && data.readonly;
       var extractable = !!data && data.extractable;
       var hasChildren = this.tree.items.length > 0;
       this.viewButton.disabled = !isCert;
       if (this.editButton !== null)
         this.editButton.disabled = !isCert;
       if (this.backupButton !== null)
         this.backupButton.disabled = !isCert || !extractable;
       if (this.backupAllButton !== null)
         this.backupAllButton.disabled = !hasChildren;
@@ skipping 118 matching lines @@
         tpmPollingTimer = window.setTimeout(checkTpmToken, 5000);
     }
   };
 
   // Export
   return {
     CertificateManagerTab: CertificateManagerTab,
     CertificateManager: CertificateManager
   };
 });