Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: net/cert/cert_database_win.cc

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: X509_NAME -> WINCRYPT_X509_NAME, rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/cert/cert_database_win.cc
diff --git a/net/cert/cert_database_win.cc b/net/cert/cert_database_win.cc
index 9bf378cc35084519b7fa2d89cb67c2f1c93f3876..3dc5ee2ac3f2909eb0486bc9d279c475a2bf3d65 100644
--- a/net/cert/cert_database_win.cc
+++ b/net/cert/cert_database_win.cc
@@ -5,13 +5,14 @@
#include "net/cert/cert_database.h"
#include <windows.h>
-#include <wincrypt.h>
-#pragma comment(lib, "crypt32.lib")
#include "base/observer_list_threadsafe.h"
+#include "crypto/wincrypt.h"
#include "net/base/net_errors.h"
#include "net/cert/x509_certificate.h"
+#pragma comment(lib, "crypt32.lib")
+
namespace net {
CertDatabase::CertDatabase()

Powered by Google App Engine
This is Rietveld 408576698