Reland: Fix imported server certs being distrusted in NSS 3.13.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9c3d72469b5ec3a3493e5e141f0511079dcf6386..f3cf2ba005ad558c6dfa18e6b6b31e067203d758 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4507,17 +4507,20 @@
             'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
-        }],
-        ['use_nss==0 and use_openssl==0', {
+        }, {  # use_nss==0
           'sources!': [
             'browser/certificate_manager_model.cc',
             'browser/certificate_manager_model.h',
+            'browser/ui/webui/options2/certificate_manager_handler2.cc',
+            'browser/ui/webui/options2/certificate_manager_handler2.h',
+          ],
+        }],
+        ['use_nss==0 and use_openssl==0', {
+          'sources!': [
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/certificate_viewer_webui.h',
             'browser/ui/webui/certificate_viewer_ui.cc',
             'browser/ui/webui/certificate_viewer_ui.h',
-            'browser/ui/webui/options2/certificate_manager_handler2.cc',
-            'browser/ui/webui/options2/certificate_manager_handler2.h',
           ],
         }],
         ['toolkit_uses_gtk == 1', {