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

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: git cl format 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 | « no previous file | crypto/crypto.gyp » ('j') | crypto/nss_util.h » ('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 a52f072aaae408745114af56ebd32827401181de..735055fcece76fe5177b6acfdfd6eea2b3c0d2af 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1825,8 +1825,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',
@@ -3207,6 +3207,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 | « no previous file | crypto/crypto.gyp » ('j') | crypto/nss_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698