Remove Windows Vista/XP specific code from net/cert and net/ssl.

net/cert/test_root_certs_win.cc

 // 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.
 
 #include "net/cert/test_root_certs.h"
 
 #include <stdint.h>
 
 #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 {
 
 namespace {
 
 // Provides a CertDllOpenStoreProv callback provider function, to be called
 // by CertOpenStore when the CERT_STORE_PROV_SYSTEM_W store is opened. See
 // http://msdn.microsoft.com/en-us/library/aa376043(VS.85).aspx.
 BOOL WINAPI InterceptedOpenStoreW(LPCSTR store_provider,
@@ skipping 143 matching lines @@
 }
 
 bool TestRootCerts::IsEmpty() const {
   return empty_;
 }
 
 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
   // various caches are flushed, when at least one certificate is added,
   // 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};
engine_config.dwSize = sizeof(engine_config);

Is the more idiomatic form.

[martijnc, 2016/05/19 21:27:33]

I kept the old code but included the 2 fields that were added in Windows 7.
Using sizeof() doesn't seem to work (because of the Windows 8+ field?).

   engine_config.dwFlags =
       CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE |
       CERT_CHAIN_ENABLE_SHARE_STORE;
   HCERTCHAINENGINE chain_engine = NULL;
   BOOL ok = CertCreateCertificateChainEngine(&engine_config, &chain_engine);
   DCHECK(ok);
   return chain_engine;
 }
 
 TestRootCerts::~TestRootCerts() {
   CertCloseStore(temporary_roots_, 0);
 }
 
 void TestRootCerts::Init() {
   empty_ = true;
   temporary_roots_ = CertOpenStore(
       CERT_STORE_PROV_MEMORY, 0, NULL,
       CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG, NULL);
   DCHECK(temporary_roots_);
 }
 
 }  // namespace net