MD Settings: Certificates: Add 'Import and bind' button for CrOS

chrome/test/data/webui/settings/certificate_manager_page_test.js

 // Copyright 2016 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('certificate_manager_page', function() {
   /**
    * A test version of CertificatesBrowserProxy. Provides helper methods
    * for allowing tests to know when a method was called, as well as
    * specifying mock responses.
    *
@@ skipping 95 matching lines @@
     },
 
     /** @override */
     exportPersonalCertificatePasswordSelected: function(password) {
       this.resolverMap_.get(
           'exportPersonalCertificatePasswordSelected').resolve(password);
       return this.fulfillRequest_();
     },
 
     /** @override */
-    importPersonalCertificate: function() {
-      this.methodCalled('importPersonalCertificate');
+    importPersonalCertificate: function(useHardwareBacked) {
+      this.methodCalled('importPersonalCertificate', useHardwareBacked);
       return Promise.resolve(true);
     },
 
     /** @override */
     importPersonalCertificatePasswordSelected: function(password) {
       this.resolverMap_.get(
           'importPersonalCertificatePasswordSelected').resolve(password);
       return this.fulfillRequest_();
     },
 
@@ skipping 664 matching lines @@
       teardown(function() { element.remove(); });
 
       /**
        * Tests the "Import" button functionality.
        * @param {!CertificateType} certificateType
        * @param {string} proxyMethodName The name of the proxy method expected
        *     to be called.
        * @param {boolean} actionEventExpected Whether a
        *     settings.CertificateActionEvent is expected to fire as a result
        *     tapping the Import button.
+       * @param {boolean} bindBtn Whether to click on the import and bind btn.
        */
       function testImportForCertificateType(
-          certificateType, proxyMethodName, actionEventExpected) {
-        element.certificateType = certificateType
+          certificateType, proxyMethodName, actionEventExpected, bindBtn) {
+        element.certificateType = certificateType;
         Polymer.dom.flush();
 
-        var importButton = element.$$('paper-button');
+        var importButton =
+            bindBtn ? element.$$('#importAndBind') : element.$$('#import');
         assertTrue(!!importButton);
 
         var waitForActionEvent = actionEventExpected ?
             test_util.eventToPromise(settings.CertificateActionEvent, element) :
             Promise.resolve(null);
 
         MockInteractions.tap(importButton);
-        return browserProxy.whenCalled(proxyMethodName).then(function() {
-          return waitForActionEvent;
-        }).then(function(event) {
-          if (actionEventExpected) {
-            assertEquals(
-                CertificateAction.IMPORT, event.detail.action);
-            assertEquals(certificateType, event.detail.certificateType);
-          }
-        });
+        return browserProxy.whenCalled(proxyMethodName)
+            .then(function(arg) {
+              if (proxyMethodName == 'importPersonalCertificate') {
+                assertNotEquals(arg, undefined);
+                assertEquals(arg, bindBtn);
+              }
+              return waitForActionEvent;
+            })
+            .then(function(event) {
+              if (actionEventExpected) {
+                assertEquals(CertificateAction.IMPORT, event.detail.action);
+                assertEquals(certificateType, event.detail.certificateType);
+              }
+            });
       }
 
       test('ImportButton_Personal', function() {
         return testImportForCertificateType(
-            CertificateType.PERSONAL,
-            'importPersonalCertificate', true);
+            CertificateType.PERSONAL, 'importPersonalCertificate', true, false);
       });
 
+      if (cr.isChromeOS) {
+        test('ImportAndBindButton_Personal', function() {
+          return testImportForCertificateType(
+              CertificateType.PERSONAL, 'importPersonalCertificate', true,
+              true);
+        });
+      }
+
       test('ImportButton_Server', function() {
         return testImportForCertificateType(
-            CertificateType.SERVER, 'importServerCertificate',
-            false);
+            CertificateType.SERVER, 'importServerCertificate', false, false);
       });
 
       test('ImportButton_CA', function() {
         return testImportForCertificateType(
-            CertificateType.CA, 'importCaCertificate', true);
+            CertificateType.CA, 'importCaCertificate', true, false);
       });
     });
   }
 
   return {
     registerTests: function() {
       registerCaTrustEditDialogTests();
       registerDeleteDialogTests();
       registerPasswordEncryptDialogTests();
       registerPasswordDecryptDialogTests();
       registerPageTests();
       registerCertificateSubentryTests();
       registerCertificateListTests();
     },
   };
 });