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..404edcb18db175e6a7fea608e7ab79c68cec76e0
--- /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 want to include cryptuiapi should instead include this header.
+
+#include <windows.h>
+#include <cryptuiapi.h>
+
+#include "crypto/wincrypt_shim.h"
+
+#endif  // CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_