net/base/x509_certificate.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

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: net/base/x509_certificate.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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/base/x509_certificate.h

diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h

index 47178f5b317b05cfcf6736e30f9bada8f387c766..961c68a4ae761e3787d3f4cd7c7cbe4796d4b554 100644

--- a/net/base/x509_certificate.h

+++ b/net/base/x509_certificate.h

@@ -24,7 +24,7 @@

#include <CoreFoundation/CFArray.h>

#include <Security/SecBase.h>

-#include "base/lock.h"

+#include "base/synchronization/lock.h"

#elif defined(USE_OPENSSL)

// Forward declaration; real one in <x509.h>

struct x509_st;

@@ -370,7 +370,7 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {

#if defined(OS_MACOSX)

// Blocks multiple threads from verifying the cert simultaneously.

// (Marked mutable because it's used in a const method.)

- mutable Lock verification_lock_;

+ mutable base::Lock verification_lock_;

#endif

// Where the certificate comes from.

« no previous file with comments | « net/base/test_completion_callback_unittest.cc ('k') | net/base/x509_certificate.cc » ('j') | no next file with comments »