chrome/app/signature_validator_win_unittest.cc - Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/signature_validator_win_unittest.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

« no previous file with comments | « chrome/app/signature_validator_win.cc ('k') | chrome/browser/password_manager/password_store_win_unittest.cc » ('j') | chrome/browser/password_manager/password_store_win_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/signature_validator_win_unittest.cc

diff --git a/chrome/app/signature_validator_win_unittest.cc b/chrome/app/signature_validator_win_unittest.cc

index 7e0b9619201686ffab2d84b24e9eadc93fe0e35d..133b756cbd163db4a340e352240ba235c2f42fd7 100644

--- a/chrome/app/signature_validator_win_unittest.cc

+++ b/chrome/app/signature_validator_win_unittest.cc

@@ -4,7 +4,6 @@

#include <windows.h>

#include <atlstr.h>

-#include <wincrypt.h>

#include <wintrust.h>

#include "base/base_paths.h"

@@ -19,6 +18,7 @@

#include "base/strings/string_util.h"

#include "chrome/app/signature_validator_win.h"

#include "crypto/sha2.h"

+#include "crypto/wincrypt.h"

#include "net/cert/test_root_certs.h"

#include "testing/gtest/include/gtest/gtest.h"