Prevent OpenSSL and msi.h clashes by setting _MSI_NO_CRYPTO

third_party/OpenSSL and msi.h both indirectly define X509_NAME so
to have avoid them clashing, tell msi.h to not include wincypt.h where
X509_NAME is set.

This became a problem in jumbo builds where msi_util_win.cc was grouped
with code using browser_process.h which includes openssl headers.

Bug: 746957
Change-Id: Ibaaf60ab6b5b46f9a86e90e0f5a7de9d4ecd57d7
Reviewed-on: https://chromium-review.googlesource.com/924072Reviewed-by: Patrick Monette <pmonette@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#537304}

chrome/browser/conflicts/msi_util_win.cc

@@ -6,6 +6,11 @@
 
 #include <windows.h>
 
+// By default msi.h includes wincrypt.h which clashes with OpenSSL
+// (both define X509_NAME) so to be able to include
+// third_party/openssl (indirectly) in the same translation unit we
+// tell msi.h to not include wincrypt.h.
+#define _MSI_NO_CRYPTO
 #include <msi.h>
 #include <msiquery.h>