Jumbo build fix: wincrypt.h and openssl clash

wincrypt.h and OpenSSL headers define the same macros (until
a later version of OpenSSL at least) so therefore we need to
include crypto/wincrypt_shim.h instead which hides the clashing
macros.

TBR=pmonette@chromium.org

Bug: 746957
Change-Id: I629859f8e381ccadfdf9b6d811330bd8fc35be95
Reviewed-on: https://chromium-review.googlesource.com/940225Reviewed-by: Daniel Bratell <bratell@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#539791}

chrome/browser/conflicts/module_info_util_win.cc

@@ -7,12 +7,8 @@
 #include <windows.h>
 
 #include <tlhelp32.h>
-#include <wincrypt.h>
 #include <wintrust.h>
 
-// This must be after wincrypt and wintrust.
-#include <mscat.h>
-
 #include <limits>
 #include <memory>
 #include <string>
@@ -25,6 +21,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/safe_browsing/pe_image_reader_win.h"
+#include "crypto/wincrypt_shim.h"
+
+// This must be after wincrypt and wintrust.
+#include <mscat.h>
 
 namespace {