Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.

net/cert/x509_cert_types_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/x509_cert_types.h"
 
 #include <windows.h>
-#include <wincrypt.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/capi_util.h"
+#include "crypto/wincrypt_shim.h"
 
 #pragma comment(lib, "crypt32.lib")
 
 namespace net {
 
 namespace {
 
 // A list of OIDs to decode. Any OID not on this list will be ignored for
 // purposes of parsing.
 const char* kOIDs[] = {
@@ skipping 65 matching lines @@
   DCHECK(ber_name_data);
 
   CRYPT_DECODE_PARA decode_para;
   decode_para.cbSize = sizeof(decode_para);
   decode_para.pfnAlloc = crypto::CryptAlloc;
   decode_para.pfnFree = crypto::CryptFree;
   CERT_NAME_INFO* name_info = NULL;
   DWORD name_info_size = 0;
   BOOL rv;
   rv = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-                           X509_NAME,
+                           WINCRYPT_X509_NAME,
                            reinterpret_cast<const BYTE*>(ber_name_data),
                            length,
                            CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG,
                            &decode_para,
                            &name_info, &name_info_size);
   if (!rv)
     return false;
   scoped_ptr<CERT_NAME_INFO, base::FreeDeleter> scoped_name_info(name_info);
 
   std::vector<std::string> common_names, locality_names, state_names,
@@ skipping 19 matching lines @@
   }
 
   SetSingle(common_names, &this->common_name);
   SetSingle(locality_names, &this->locality_name);
   SetSingle(state_names, &this->state_or_province_name);
   SetSingle(country_names, &this->country_name);
   return true;
 }
 
 }  // namespace net