chrome/browser/password_manager/password_store_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/browser/password_manager/password_store_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

Index: chrome/browser/password_manager/password_store_win_unittest.cc

diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc

index c4a4033a8592345c98241e402c96a714c67bd7da..fb9ee6d12e9842833b272224b147fff3565d3ec6 100644

--- a/chrome/browser/password_manager/password_store_win_unittest.cc

+++ b/chrome/browser/password_manager/password_store_win_unittest.cc

@@ -3,7 +3,6 @@

// found in the LICENSE file.

#include <windows.h>

-#include <wincrypt.h>

#include <string>

Ryan Sleevi 2014/10/29 20:40:24 should be a newline between 5 and 6 here

davidben 2014/10/29 22:49:58 Done.

#include <vector>

@@ -26,6 +25,7 @@

#include "components/password_manager/core/common/password_manager_pref_names.h"

#include "components/webdata/common/web_database_service.h"

#include "content/public/test/test_browser_thread.h"

+#include "crypto/wincrypt.h"

#include "testing/gmock/include/gmock/gmock.h"

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

« no previous file with comments | « chrome/app/signature_validator_win_unittest.cc ('k') | components/os_crypt/ie7_password_win.cc » ('j') | net/cert/x509_certificate.h » ('J')