Index: net/cookies/cookie_monster.cc |
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc |
index 84fc30dd67e4c8ac0df8d4e76930ce4ea39c3318..8f516ce6c60203e59258dd496c73845b9cbfcb37 100644 |
--- a/net/cookies/cookie_monster.cc |
+++ b/net/cookies/cookie_monster.cc |
@@ -532,9 +532,9 @@ class CookieMonster::CookieMonsterTask |
return cookie_monster_; |
} |
+ private: |
friend class base::RefCountedThreadSafe<CookieMonsterTask>; |
- private: |
CookieMonster* cookie_monster_; |
scoped_refptr<base::MessageLoopProxy> thread_; |
@@ -544,9 +544,10 @@ class CookieMonster::CookieMonsterTask |
CookieMonster::CookieMonsterTask::CookieMonsterTask( |
CookieMonster* cookie_monster) |
: cookie_monster_(cookie_monster), |
- thread_(base::MessageLoopProxy::current()) { } |
+ thread_(base::MessageLoopProxy::current()) { |
+} |
-CookieMonster::CookieMonsterTask::~CookieMonsterTask() { } |
+CookieMonster::CookieMonsterTask::~CookieMonsterTask() {} |
// Unfortunately, one cannot re-bind a Callback with parameters into a closure. |
// Therefore, the closure passed to InvokeCallback is a clumsy binding of |
@@ -586,10 +587,15 @@ class CookieMonster::SetCookieWithDetailsTask |
expiration_time_(expiration_time), |
secure_(secure), |
http_only_(http_only), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~SetCookieWithDetailsTask() {} |
+ |
private: |
GURL url_; |
std::string name_; |
@@ -621,10 +627,15 @@ class CookieMonster::GetAllCookiesTask |
GetAllCookiesTask(CookieMonster* cookie_monster, |
const CookieMonster::GetCookieListCallback& callback) |
: CookieMonsterTask(cookie_monster), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~GetAllCookiesTask() {} |
+ |
private: |
CookieMonster::GetCookieListCallback callback_; |
@@ -651,10 +662,15 @@ class CookieMonster::GetAllCookiesForURLWithOptionsTask |
: CookieMonsterTask(cookie_monster), |
url_(url), |
options_(options), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~GetAllCookiesForURLWithOptionsTask() {} |
+ |
private: |
GURL url_; |
CookieOptions options_; |
@@ -678,10 +694,15 @@ class CookieMonster::DeleteAllTask : public CookieMonster::CookieMonsterTask { |
DeleteAllTask(CookieMonster* cookie_monster, |
const CookieMonster::DeleteCallback& callback) |
: CookieMonsterTask(cookie_monster), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteAllTask() {} |
+ |
private: |
CookieMonster::DeleteCallback callback_; |
@@ -708,10 +729,15 @@ class CookieMonster::DeleteAllCreatedBetweenTask |
: CookieMonsterTask(cookie_monster), |
delete_begin_(delete_begin), |
delete_end_(delete_end), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteAllCreatedBetweenTask() {} |
+ |
private: |
Time delete_begin_; |
Time delete_end_; |
@@ -738,10 +764,15 @@ class CookieMonster::DeleteAllForHostTask |
const CookieMonster::DeleteCallback& callback) |
: CookieMonsterTask(cookie_monster), |
url_(url), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteAllForHostTask() {} |
+ |
private: |
GURL url_; |
CookieMonster::DeleteCallback callback_; |
@@ -767,10 +798,15 @@ class CookieMonster::DeleteCanonicalCookieTask |
const CookieMonster::DeleteCookieCallback& callback) |
: CookieMonsterTask(cookie_monster), |
cookie_(cookie), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteCanonicalCookieTask() {} |
+ |
private: |
CookieMonster::CanonicalCookie cookie_; |
CookieMonster::DeleteCookieCallback callback_; |
@@ -799,10 +835,15 @@ class CookieMonster::SetCookieWithOptionsTask |
url_(url), |
cookie_line_(cookie_line), |
options_(options), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~SetCookieWithOptionsTask() {} |
+ |
private: |
GURL url_; |
std::string cookie_line_; |
@@ -832,10 +873,15 @@ class CookieMonster::GetCookiesWithOptionsTask |
: CookieMonsterTask(cookie_monster), |
url_(url), |
options_(options), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~GetCookiesWithOptionsTask() {} |
+ |
private: |
GURL url_; |
CookieOptions options_; |
@@ -866,8 +912,12 @@ class CookieMonster::GetCookiesWithInfoTask |
options_(options), |
callback_(callback) { } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~GetCookiesWithInfoTask() {} |
+ |
private: |
GURL url_; |
CookieOptions options_; |
@@ -901,8 +951,12 @@ class CookieMonster::DeleteCookieTask |
cookie_name_(cookie_name), |
callback_(callback) { } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteCookieTask() {} |
+ |
private: |
GURL url_; |
std::string cookie_name_; |
@@ -926,10 +980,15 @@ class CookieMonster::DeleteSessionCookiesTask |
CookieMonster* cookie_monster, |
const CookieMonster::DeleteCallback& callback) |
: CookieMonsterTask(cookie_monster), |
- callback_(callback) { } |
+ callback_(callback) { |
+ } |
+ // CookieMonster::CookieMonsterTask: |
virtual void Run() OVERRIDE; |
+ protected: |
+ virtual ~DeleteSessionCookiesTask() {} |
+ |
private: |
CookieMonster::DeleteCallback callback_; |