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

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

index 6a17d38b1112f28b5d722aa12eda6e2801502b29..b2e3d2b6e3706ea3ec3ea76f7f09ded036ff2ec2 100644

--- a/net/base/cookie_monster.h

+++ b/net/base/cookie_monster.h

@@ -15,9 +15,9 @@

#include "base/basictypes.h"

#include "base/gtest_prod_util.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

#include "base/scoped_ptr.h"

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

#include "base/task.h"

#include "base/time.h"

#include "net/base/cookie_store.h"

@@ -485,7 +485,7 @@ class CookieMonster : public CookieStore {

scoped_refptr<Delegate> delegate_;

// Lock for thread-safety

- Lock lock_;

+ base::Lock lock_;

base::Time last_statistic_record_time_;

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