Convert Windows to use X509CertificateBytes.

chrome/browser/ui/cryptuiapi_shim.h

Index: chrome/browser/ui/cryptuiapi_shim.h
diff --git a/chrome/browser/ui/cryptuiapi_shim.h b/chrome/browser/ui/cryptuiapi_shim.h
new file mode 100644
index 0000000000000000000000000000000000000000..0d19ecc250e987cf3f52fbb6d6163ee22eaeadc1
--- /dev/null
+++ b/chrome/browser/ui/cryptuiapi_shim.h
@@ -0,0 +1,18 @@
+// Copyright 2017 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.
+
+#ifndef CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_
+#define CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_
+
+// cryptuiapi.h includes wincrypt.h which defines macros which conflict with
+// OpenSSL's types. This header includes cryptuiapi.h and then wincrypt_shim.h
+// which undefines the OpenSSL macros which conflict. Any Chromium headers
+// which include cryptuiapi should instead include this header.

[davidben, 2017/06/15 23:55:18]

Blegh. I wonder how crazy it'd be to add a #define to BoringSSL which suppresses
everything relating to crypto/x509 from the headers, now that we've gotten
pretty far in unshipping. I guess we'd need to be fully there.

I was going to say I can break the ssl.h => x509.h #include link, but the
problem is that'd rely on forward decls and the forward decls still collide.

+
+#include <windows.h>
+#include <cryptuiapi.h>
+
+#include "crypto/wincrypt_shim.h"
+
+#endif  // CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_