Chromium Code Reviews| Index: net/cert/test_root_certs_win.cc |
| diff --git a/net/cert/test_root_certs_win.cc b/net/cert/test_root_certs_win.cc |
| index 67bf1b09f75ac0f5b13f23803f316adcf6e26c09..8f17746404603af9f5da13d3461acdd243e2f00f 100644 |
| --- a/net/cert/test_root_certs_win.cc |
| +++ b/net/cert/test_root_certs_win.cc |
| @@ -9,7 +9,6 @@ |
| #include "base/lazy_instance.h" |
| #include "base/logging.h" |
| #include "base/win/win_util.h" |
| -#include "base/win/windows_version.h" |
| #include "net/cert/x509_certificate.h" |
| namespace net { |
| @@ -173,12 +172,6 @@ HCERTCHAINENGINE TestRootCerts::GetChainEngine() const { |
| if (IsEmpty()) |
| return NULL; // Default chain engine will suffice. |
| - // Windows versions before 7 don't accept the struct size for later versions. |
| - // We report the size of the old struct since we don't need the new members. |
| - static const DWORD kSizeofCertChainEngineConfig = |
| - SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER( |
| - CERT_CHAIN_ENGINE_CONFIG, CycleDetectionModulus); |
| - |
| // Each HCERTCHAINENGINE caches both the configured system stores and |
| // information about each chain that has been built. In order to ensure |
| // that changes to |temporary_roots_| are properly propagated and that the |
| @@ -186,9 +179,7 @@ HCERTCHAINENGINE TestRootCerts::GetChainEngine() const { |
| // return a new chain engine for every call. Each chain engine creation |
| // should re-open the root store, ensuring the most recent changes are |
| // visible. |
| - CERT_CHAIN_ENGINE_CONFIG engine_config = { |
| - kSizeofCertChainEngineConfig |
| - }; |
| + CERT_CHAIN_ENGINE_CONFIG engine_config = {sizeof(CERT_CHAIN_ENGINE_CONFIG)}; |
|
Ryan Sleevi
2016/05/17 20:26:01
CERT_CHAIN_ENGINE_CONFIG engine_config = {0};
engi
martijnc
2016/05/19 21:27:33
I kept the old code but included the 2 fields that
|
| engine_config.dwFlags = |
| CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE | |
| CERT_CHAIN_ENABLE_SHARE_STORE; |