Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6597)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 401623006: Extract ScopedTestNSSDB from nss_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a DCHECK to SetTestSystemKeySlot. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c31246a6aacadd050b2a343f26f6e3d91d7eb8f0..8fd16534ebc9ea5dd938f86cb3d2707abff82734 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1829,8 +1829,8 @@
'browser/certificate_manager_model.cc',
'browser/certificate_manager_model.h',
'browser/net/nss_context.cc',
- 'browser/net/nss_context_chromeos.cc',
'browser/net/nss_context.h',
+ 'browser/net/nss_context_chromeos.cc',
'browser/net/nss_context_linux.cc',
'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
'third_party/mozilla_security_manager/nsNSSCertHelper.h',
@@ -3211,6 +3211,13 @@
}],
['use_nss==1', {
'sources': [ '<@(chrome_browser_nss_sources)' ],
+ 'conditions': [
+ ['chromeos==1', {
+ 'sources!': [ 'browser/net/nss_context_linux.cc' ],
+ }, { # chromeos==0
+ 'sources!': [ 'browser/net/nss_context_chromeos.cc' ],
+ }],
+ ],
}],
['notifications==1', {
'sources': [ '<@(chrome_browser_notifications_sources)' ],
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698