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

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 4489 matching lines @@
         }],
         ['use_nss==1', {
           'sources': [
             'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
             'third_party/mozilla_security_manager/nsNSSCertHelper.h',
             'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
             'third_party/mozilla_security_manager/nsNSSCertificate.h',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
+        }, {  # 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/certificate_manager_model.cc',
-            'browser/certificate_manager_model.h',
             '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', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:ssl',
             '../build/linux/system.gyp:x11',
@@ skipping 610 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }