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

Unified Diff: net/net.gyp

Issue 4646001: Implement LoadTemporaryRoot for Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/net/base
Patch Set: bulach and wtc feedback Created 10 years, 1 month 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
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 1d73dd10dc8af3fe9c1d641791aee19d3e0422e9..94996f86c5e70e11a32461cd97afc00684880361 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -177,6 +177,12 @@
'base/ssl_info.h',
'base/static_cookie_policy.cc',
'base/static_cookie_policy.h',
+ 'base/test_root_certs.cc',
+ 'base/test_root_certs.h',
+ 'base/test_root_certs_mac.cc',
+ 'base/test_root_certs_nss.cc',
+ 'base/test_root_certs_openssl.cc',
+ 'base/test_root_certs_win.cc',
'base/transport_security_state.cc',
'base/transport_security_state.h',
'base/sys_addrinfo.h',
@@ -252,6 +258,7 @@
'sources!': [
'base/cert_database_nss.cc',
'base/keygen_handler_nss.cc',
+ 'base/test_root_certs_nss.cc',
'base/x509_certificate_nss.cc',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
@@ -272,6 +279,7 @@
'base/keygen_handler_nss.cc',
'base/nss_memio.c',
'base/nss_memio.h',
+ 'base/test_root_certs_nss.cc',
'base/x509_certificate_nss.cc',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
@@ -289,6 +297,7 @@
'base/keygen_handler_openssl.cc',
'base/openssl_util.cc',
'base/openssl_util.h',
+ 'base/test_root_certs_openssl.cc',
'base/x509_certificate_openssl.cc',
'base/x509_openssl_util.cc',
'base/x509_openssl_util.h',
@@ -1164,8 +1173,6 @@
'../testing/gtest.gyp:gtest',
],
'sources': [
- 'base/cert_test_util.cc',
- 'base/cert_test_util.h',
'disk_cache/disk_cache_test_util.cc',
'disk_cache/disk_cache_test_util.h',
'proxy/proxy_config_service_common_unittest.cc',
@@ -1192,7 +1199,7 @@
['use_openssl==1', {
'dependencies': [
'../build/linux/system.gyp:openssl',
- ]
+ ],
}, {
'dependencies': [
'../build/linux/system.gyp:nss',

Powered by Google App Engine
This is Rietveld 408576698