chrome/browser/safe_browsing/safe_browsing_database.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: chrome/browser/safe_browsing/safe_browsing_database.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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_helper.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_database.h

diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h

index 980a8d3bea863caa3052d5cfa073f6adae6cc5b1..4bd6db98ab5e87bf0c050980fd5967995a76b4fd 100644

--- a/chrome/browser/safe_browsing/safe_browsing_database.h

+++ b/chrome/browser/safe_browsing/safe_browsing_database.h

@@ -10,8 +10,8 @@

#include <vector>

#include "base/file_path.h"

-#include "base/lock.h"

#include "base/scoped_ptr.h"

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

#include "base/task.h"

#include "chrome/browser/safe_browsing/safe_browsing_store.h"

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

@@ -236,7 +236,7 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {

// Lock for protecting access to variables that may be used on the

// IO thread. This includes |browse_bloom_filter_|, |full_browse_hashes_|,

// |pending_browse_hashes_|, and |prefix_miss_cache_|.

- Lock lookup_lock_;

+ base::Lock lookup_lock_;

// Underlying persistent store for chunk data.

// For browsing related (phishing and malware URLs) chunks and prefixes.

« no previous file with comments | « chrome/browser/renderer_host/render_widget_helper.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('j') | no next file with comments »