WebUI: Move certificate-manager tests under c/t/d/webui/cr_components.

Also renaming CrSettingsCertificateManagerTest.All to
CrComponentsCertificateManagerTest.All.

This is in preparation of migrating this component and its tests to Polymer 3.

Bug: 1042558
Change-Id: I2ebedf55f43d368faf097fe44c5ee3d052c61813
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013632
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733858}

chrome/test/data/webui/settings/certificate_manager_test.js → chrome/test/data/webui/cr_components/certificate_manager_test.js

@@ -888,7 +888,6 @@ cr.define('certificate_manager', function() {
         });
       });
     }
-
   });
 
   suite('CertificateListTests', function() {

chrome/test/data/webui/cr_components/cr_components_browsertest.js

@@ -96,3 +96,39 @@ TEST_F('CrComponentsNetworkConfigTest', 'All', function() {
 });
 
 GEN('#endif');
+
+GEN('#if defined(USE_NSS_CERTS)');
+
+/**
+ * Test fixture for chrome://settings/certificates. This tests the
+ * certificate-manager component in the context of the Settings privacy page.
+ * @constructor
+ * @extends {CrComponentsBrowserTest}
+ */
+function CrComponentsCertificateManagerTest() {}
+
+CrComponentsCertificateManagerTest.prototype = {
+  __proto__: CrComponentsBrowserTest.prototype,
+
+  /**
+   * Using the certificate-manager instance within
+   * chrome://settings/privacy_page for these tests, so that all strings are
+   * properly defined.
+   * @override
+   */
+  browsePreload: 'chrome://settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
+    '../test_util.js',
+    '../test_browser_proxy.js',
+    '../settings/ensure_lazy_loaded.js',
+    'certificate_manager_test.js',
+  ]),
+};
+
+TEST_F('CrComponentsCertificateManagerTest', 'All', function() {
+  mocha.run();
+});
+
+GEN('#endif  // defined(USE_NSS_CERTS)');

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

@@ -840,40 +840,6 @@ TEST_F('CrSettingsSearchEnginesTest', 'All', function() {
   mocha.run();
 });
 
-GEN('#if defined(USE_NSS_CERTS)');
-
-/**
- * Test fixture for chrome://settings/certificates. This tests the
- * certificate-manager component in the context of the Settings privacy page.
- * @constructor
- * @extends {CrSettingsBrowserTest}
- */
-function CrSettingsCertificateManagerTest() {}
-
-CrSettingsCertificateManagerTest.prototype = {
-  __proto__: CrSettingsBrowserTest.prototype,
-
-  /**
-   * The certificate-manager subpage is embedded in privacy_page.html.
-   * @override
-   */
-  browsePreload: 'chrome://settings/privacy_page/privacy_page.html',
-
-  /** @override */
-  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
-    '../test_util.js',
-    '../test_browser_proxy.js',
-    'ensure_lazy_loaded.js',
-    'certificate_manager_test.js',
-  ]),
-};
-
-TEST_F('CrSettingsCertificateManagerTest', 'All', function() {
-  mocha.run();
-});
-
-GEN('#endif  // defined(USE_NSS_CERTS)');
-
 /**
  * Test fixture for
  * chrome/browser/resources/settings/privacy_page/personalization_options.html.